This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch] jacks xfails and tclsh
- From: Andreas Tobler <toa at pop dot agri dot ch>
- To: Java Patches <java-patches at gcc dot gnu dot org>
- Date: Tue, 13 Jul 2004 18:01:11 +0200
- Subject: [patch] jacks xfails and tclsh
Hi all,
this is what I have so far.
Does it look ok for main?
Thanks,
Andreas
2004-07-13 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/libjava.jacks/jacks.exp (gcj_jacks_write): Add deprecation
flag to the gcj_setup.
(gcj_jacks_run): Check tclsh version and launch jacks directly with
the tclsh.
* testsuite/libjava.jacks/jacks.xfail: Update fails to reflect the
deprecation flag change. 58 XFAILS removed.
Index: testsuite/libjava.jacks/jacks.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.jacks/jacks.exp,v
retrieving revision 1.6
diff -u -r1.6 jacks.exp
--- testsuite/libjava.jacks/jacks.exp 25 Apr 2004 04:19:13 -0000 1.6
+++ testsuite/libjava.jacks/jacks.exp 13 Jul 2004 15:59:46 -0000
@@ -35,6 +35,7 @@
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,17 @@
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 { $tcl_ver >= "8.3" } {
+ catch {exec tclsh$tcl_ver jacks gcj} msg
+ gcj_jacks_parse logging/gcj.log
+ } else {
+ verbose "No suitable tclsh found"
+ return
+ }
cd $here
}