Wrong CLASSPATH is set during libjava tests

Mon Jul 3 15:55:00 GMT 2006

Kaz Kojima wrote:
> So I suspect that something is wrong in my local environment.
> Does anyone see this problem? The version of DejaGnu I'm using is

We pick up the libgcj-tools*.jar iso the libgcj-4.2.0.jar.
I think this one should fix it.
Andreas
Index: testsuite/lib/libjava.exp
===================================================================

--- testsuite/lib/libjava.exp (revision 115147)
+++ testsuite/lib/libjava.exp (working copy)
@@ -144,6 +144,7 @@
 global tool_root_dir
 global libjava_libgcc_s_path
 global target_triplet
+ global libjava_version
 # We set LC_ALL and LANG to C so that we get the same error 
messages as expected.
 setenv LC_ALL C
@@ -164,7 +165,14 @@
 }
 # Find the libgcj jar file.
- set libgcj_jar [glob $objdir/../libgcj-*.jar]
+
+ set tmp [eval exec "$GCJ_UNDER_TEST -v 2>@ stdout"]
+ regexp " version \[^\n\r\]*" $tmp version
+ set libjava_version [lindex $version 1]
+
+ verbose "version: $libjava_version"
+
+ set libgcj_jar [glob $objdir/../libgcj-$libjava_version.jar]
 verbose "jar file is $libgcj_jar"
 # FIXME: This finds libgcj.spec for the default multilib.
