diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-04 19:11:20 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-04 19:11:20 +0000 |
| commit | db12dec9c543f40d6bf12a205ea118feade8b4d0 (patch) | |
| tree | 51c5fff92b5f2d2b45f265b4ecd2370fa6b78c01 /libjava/testsuite/lib | |
| parent | 2754cb05c5faf38bcf54290fef29c01b727b4096 (diff) | |
| download | gcc-db12dec9c543f40d6bf12a205ea118feade8b4d0.tar.gz | |
2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar
instead of libgcj-*.jar.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115181 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/lib')
| -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. |