diff options
Diffstat (limited to 'libjava/testsuite/lib/libjava.exp')
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index fa9c0444733..4b1f7ae2df4 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -144,6 +144,7 @@ proc libjava_init { args } { 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 @@ proc libjava_init { args } { } # 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. |
