[patch] fix testsuite failures

[Andreas Tobler <toa@pop.agri.ch>]

Hello,

since this patch http://gcc.gnu.org/ml/gcc-cvs/2006-06/msg00816.html
we now have libgcj-tools-4.2.0.jar and libgcj-4.2.0.jar in the build 
path. The testsuite was looking for libgcj-*.jar to find the right jar 
file. Now this doesn't work anymore and causes many funny failures.

This patch is looking now for the libgcj-$version.jar and should fix the 
fallout.

Ok for main?


Andreas

2006-07-03  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar
	instead of libgcj-*.jar.


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.