2 files changed, 15 insertions, 61 deletions
diff --git a/libjava/testsuite/libjava.jacks/jacks.exp b/libjava/testsuite/libjava.jacks/jacks.exp
index 679c7f5..228e18f 100644
--- a/libjava/testsuite/libjava.jacks/jacks.exp
+++ b/libjava/testsuite/libjava.jacks/jacks.exp
@@ -35,6 +35,7 @@ proc gcj_jacks_write {filename} {
   puts $fd "set JAVA_FLAGS \"-mx=64m\""
 
   puts $fd "set JAVAC_ENCODING_FLAG --encoding="
+  puts $fd "set JAVAC_DEPRECATION_FLAG -Wdeprecated"
   puts $fd "set tcltest::testConstraints(encoding) 1"
   puts $fd "set tcltest::testConstraints(gcj) 1"
   puts $fd "set tcltest::testConstraints(assert) 1"
@@ -97,9 +98,20 @@ proc gcj_jacks_run {} {
   verbose "Running Jacks..."
   # Just ignore error exits from the jacks program.
   # It will always error exit for us, since don't completely pass.
-  catch {exec ./jacks gcj} msg
-
-  gcj_jacks_parse logging/gcj.log
+  # At the moment jacks has a hardcoded call to tclsh8.3. To override this,
+  # we check here on the version and launch the script directly with the
+  # tclsh$tcl_ver.
+  set tcl_ver [info tclversion]
+  if {[package vcompare  $tcl_ver 8.3] >= 0 } {
+    if {[catch {exec tclsh$tcl_ver jacks gcj} msg]} {
+	send_log "Couldn't run jacks: $msg\n"
+	return
+    }
+    gcj_jacks_parse logging/gcj.log
+  } else {
+      send_log "No suitable tclsh found, you need at least version 8.3 or up.\n"
+      return
+  }
 
   cd $here
 }
diff --git a/libjava/testsuite/libjava.jacks/jacks.xfail b/libjava/testsuite/libjava.jacks/jacks.xfail
index 7d319df..f4aa4bb 100644
--- a/libjava/testsuite/libjava.jacks/jacks.xfail
+++ b/libjava/testsuite/libjava.jacks/jacks.xfail
@@ -446,74 +446,16 @@
 4.5.4-parameter-3
 4.5.4-static-1
 4.5.4-static-5
-4.7.10-jvms-class-1
-4.7.10-jvms-class-10
-4.7.10-jvms-class-11
-4.7.10-jvms-class-12
-4.7.10-jvms-class-13
-4.7.10-jvms-class-14
-4.7.10-jvms-class-15
-4.7.10-jvms-class-16
-4.7.10-jvms-class-17
 4.7.10-jvms-class-18
-4.7.10-jvms-class-19
-4.7.10-jvms-class-2
-4.7.10-jvms-class-3
-4.7.10-jvms-class-4
-4.7.10-jvms-class-5
 4.7.10-jvms-class-6
 4.7.10-jvms-class-7
 4.7.10-jvms-class-8
-4.7.10-jvms-class-9
-4.7.10-jvms-constructor-1
-4.7.10-jvms-constructor-10
-4.7.10-jvms-constructor-11
-4.7.10-jvms-constructor-12
-4.7.10-jvms-constructor-13
-4.7.10-jvms-constructor-14
-4.7.10-jvms-constructor-2
-4.7.10-jvms-constructor-3
-4.7.10-jvms-constructor-4
-4.7.10-jvms-constructor-5
 4.7.10-jvms-constructor-6
-4.7.10-jvms-constructor-7
 4.7.10-jvms-constructor-8
-4.7.10-jvms-constructor-9
-4.7.10-jvms-field-1
-4.7.10-jvms-field-10
-4.7.10-jvms-field-11
-4.7.10-jvms-field-12
-4.7.10-jvms-field-13
-4.7.10-jvms-field-2
-4.7.10-jvms-field-3
-4.7.10-jvms-field-4
-4.7.10-jvms-field-5
 4.7.10-jvms-field-6
-4.7.10-jvms-field-7
 4.7.10-jvms-field-8
-4.7.10-jvms-field-9
-4.7.10-jvms-lex-1
-4.7.10-jvms-lex-10
-4.7.10-jvms-lex-2
-4.7.10-jvms-lex-3
-4.7.10-jvms-lex-4
-4.7.10-jvms-lex-5
-4.7.10-jvms-lex-6
-4.7.10-jvms-lex-7
-4.7.10-jvms-lex-8
-4.7.10-jvms-lex-9
-4.7.10-jvms-method-1
-4.7.10-jvms-method-10
-4.7.10-jvms-method-11
-4.7.10-jvms-method-12
-4.7.10-jvms-method-2
-4.7.10-jvms-method-3
-4.7.10-jvms-method-4
-4.7.10-jvms-method-5
 4.7.10-jvms-method-6
-4.7.10-jvms-method-7
 4.7.10-jvms-method-8
-4.7.10-jvms-method-9
 5.1.2-btd-1
 5.1.2-btd-3
 5.1.2-btd-5