[patch] fix testsuite failures

[patch] fix testsuite failures

[Andreas Tobler]

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.

Re: [patch] fix testsuite failures

[Bryce McKinlay]

Andreas Tobler wrote:
> 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.

Yes, thank you.

Bryce

Re: [patch] fix testsuite failures

[Andreas Tobler]

Bryce McKinlay wrote:
> Andreas Tobler wrote:
>> 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.
> 
> Yes, thank you.

Thank you. Unfortunately Tom F. pointed out that I produced a fallout if 
one runs make check in the libjava build dir. I tested from the gcc 
toplevel build with make check-target-libjava.

The appended patch fixes this.

Ok?

Thanks,
Andreas

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

	* testsuite/lib/libjava.exp (libjava_init): Call the GCJ_UNDER_TEST with
	the -B$specdir.


Index: testsuite/lib/libjava.exp
===================================================================
--- testsuite/lib/libjava.exp   (revision 115181)
+++ testsuite/lib/libjava.exp   (working copy)
@@ -166,7 +166,12 @@

      # Find the libgcj jar file.

-    set tmp [eval exec "$GCJ_UNDER_TEST -v 2>@ stdout"]
+    # FIXME: This finds libgcj.spec for the default multilib.
+    # If thread models differ between multilibs, this has to be moved
+    # to libjava_arguments
+    set specdir [libjava_find_spec]
+
+    set tmp [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
      regexp " version \[^\n\r\]*" $tmp version
      set libjava_version [lindex $version 1]

@@ -175,11 +180,6 @@
      set libgcj_jar [glob $objdir/../libgcj-$libjava_version.jar]
      verbose "jar file is $libgcj_jar"

-    # FIXME: This finds libgcj.spec for the default multilib.
-    # If thread models differ between multilibs, this has to be moved
-    # to libjava_arguments
-    set specdir [libjava_find_spec]
-
      # The -B is so we find libgcj.spec.
      set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
      regexp -- "Thread model: (\[^\n\]+)\n" $text ignore model

Re: [patch] fix testsuite failures

[Bryce McKinlay]

Andreas Tobler wrote:
> Thank you. Unfortunately Tom F. pointed out that I produced a fallout 
> if one runs make check in the libjava build dir. I tested from the gcc 
> toplevel build with make check-target-libjava.
>
> The appended patch fixes this.
>
> Ok?
>
> Thanks,
> Andreas
>
> 2006-07-04  Andreas Tobler  <a.tobler@schweiz.ch>
>
>     * testsuite/lib/libjava.exp (libjava_init): Call the 
> GCJ_UNDER_TEST with
>     the -B$specdir.

OK. I think you could re-use the value of "text"/"tmp" to avoid exec'ing 
gcc multiple times, but it probably doesn't matter too much.

Bryce

Re: [patch] fix testsuite failures

[Andreas Tobler]

Bryce McKinlay wrote:

>> 2006-07-04  Andreas Tobler  <a.tobler@schweiz.ch>
>>
>>     * testsuite/lib/libjava.exp (libjava_init): Call the 
>> GCJ_UNDER_TEST with
>>     the -B$specdir.
> 
> OK. I think you could re-use the value of "text"/"tmp" to avoid exec'ing 
> gcc multiple times, but it probably doesn't matter too much.

Thank you. I'll commit this one soon. And sorry for the breakage.

Andreas

Index: testsuite/lib/libjava.exp
===================================================================
--- testsuite/lib/libjava.exp   (revision 115184)
+++ testsuite/lib/libjava.exp   (working copy)
@@ -166,8 +166,13 @@

      # Find the libgcj jar file.

-    set tmp [eval exec "$GCJ_UNDER_TEST -v 2>@ stdout"]
-    regexp " version \[^\n\r\]*" $tmp version
+    # FIXME: This finds libgcj.spec for the default multilib.
+    # If thread models differ between multilibs, this has to be moved
+    # to libjava_arguments
+    set specdir [libjava_find_spec]
+
+    set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
+    regexp " version \[^\n\r\]*" $text version
      set libjava_version [lindex $version 1]

      verbose "version: $libjava_version"
@@ -175,13 +180,7 @@
      set libgcj_jar [glob $objdir/../libgcj-$libjava_version.jar]
      verbose "jar file is $libgcj_jar"

-    # FIXME: This finds libgcj.spec for the default multilib.
-    # If thread models differ between multilibs, this has to be moved
-    # to libjava_arguments
-    set specdir [libjava_find_spec]
-
      # The -B is so we find libgcj.spec.
-    set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
      regexp -- "Thread model: (\[^\n\]+)\n" $text ignore model
      set libjava_uses_threads [expr {! ($model == "no"
                                        || $model == "none"