This is the mail archive of the
java@gcc.gnu.org
mailing list for the Java project.
Re: Wrong CLASSPATH is set during libjava tests
- From: Andreas Tobler <toa at pop dot agri dot ch>
- To: Kaz Kojima <kkojima at rr dot iij4u dot or dot jp>
- Cc: java at gcc dot gnu dot org
- Date: Mon, 03 Jul 2006 17:54:58 +0200
- Subject: Re: Wrong CLASSPATH is set during libjava tests
- References: <20060703.190721.02303720.kkojima@rr.iij4u.or.jp>
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.