2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar
instead of libgcj-*.jar.
From-SVN: r115181
+2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar
+ instead of libgcj-*.jar.
+
2006-07-04 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/28244:
2006-07-04 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/28244:
global tool_root_dir
global libjava_libgcc_s_path
global target_triplet
global tool_root_dir
global libjava_libgcc_s_path
global target_triplet
# We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C
# We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C
}
# Find the libgcj jar file.
}
# 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.
verbose "jar file is $libgcj_jar"
# FIXME: This finds libgcj.spec for the default multilib.