re PR other/5874 (gcc-3.1 20020304 (prerelease) FAILs in libjava testsuite with RUNTE...

	* libjava.jni/jni.exp (gcj_jni_build_header): Use local_exec, not
	target_compile.  Fixes PR other/5874.

From-SVN: r50923

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 888546b10a334b9b8838ad590032849e7d10a2ef..fe5ed13786e70bf33a45b576c7ca559a8bdc3dc6 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-17  Tom Tromey  <tromey@redhat.com>
+
+       * libjava.jni/jni.exp (gcj_jni_build_header): Use local_exec, not
+       target_compile.  Fixes PR other/5874.
+
 2002-03-15  Eric Blake  <ebb9@email.byu.edu>
 
        For PR java/5902:

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index f052766b4f9aefa59741b8e3a96525da87a8dbb1..8dd8b8af049c3840d686101de2bb951bad96e012 100644 (file)
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -30,11 +30,10 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
 proc gcj_jni_build_header {file} {
   set gcjh [find_gcjh]
   set file [file rootname $file]
-  set options [list "compiler=$gcjh" \
-                "additional_flags=-jni"]
-  set x [prune_warnings [target_compile $file "" none $options]]
+  set x [string trim [prune_warnings \
+                       [lindex [local_exec "$gcjh -jni $file" "" "" 300] 1]]]
   if {$x != ""} {
-    verbose "target_compile failed: $x" 2
+    verbose "local_exec failed: $x" 2
     fail "$file header generation"
     return 0
   }