diff options
| author | Andreas Tobler <a.tobler@schweiz.ch> | 2006-07-04 21:11:20 +0200 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2006-07-04 21:11:20 +0200 |
| commit | 6215885d43d8ebe55454794cedfe092604f62718 (patch) | |
| tree | 51c5fff92b5f2d2b45f265b4ecd2370fa6b78c01 /libjava | |
| parent | 56d30bd5c8440e8596a4165f2d42d09a28fc062c (diff) | |
| download | gcc-6215885d43d8ebe55454794cedfe092604f62718.zip gcc-6215885d43d8ebe55454794cedfe092604f62718.tar.gz gcc-6215885d43d8ebe55454794cedfe092604f62718.tar.bz2 | |
libjava.exp (libjava_init): Look for libgcj-$version.jar instead of libgcj-*.jar.
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7fbac79..3e22f23 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +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: diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index fa9c044..4b1f7ae 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. |