From d2b55bc5592e79c375a73647d8031c4af403aec2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 21 Dec 2004 01:01:08 +0000 Subject: jar.exp (gcj_jar_interpret): Updated. * testsuite/libjava.jar/jar.exp (gcj_jar_interpret): Updated. * testsuite/libjava.verify/verify.exp (gcj_verify_run): Updated. * testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Updated. * testsuite/lib/libjava.exp (libjava_find_spec): Don't use get_multilibs. (libjava_find_gij): Likewise. Changed return result if gij not found. (test_libjava_from_javac): Updated. From-SVN: r92446 --- libjava/testsuite/libjava.jni/jni.exp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libjava/testsuite/libjava.jni') diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 838b833..cbd90ca 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -165,17 +165,18 @@ proc gcj_jni_test_one {file} { # appropriate tests. set errname [file rootname [file tail $file]] set gij [libjava_find_gij] - # libjava_find_gij will return `gij' if it couldn't find the + # libjava_find_gij will return "" if it couldn't find the # program; in this case we want to skip the test. # If the libraries are not installed yet, we have to pass them via # cxxldlibflags to libjava_invoke. - if {$INTERPRETER == "yes" && $gij != "gij"} { - libjava_invoke $errname "gij test" opts $gij \ - "" $resultfile $cxxldlibflags $main + if {$INTERPRETER == "yes" && $gij != ""} { + libjava_invoke $errname "gij test" opts $gij \ + "" $resultfile $cxxldlibflags $main } # When we succeed we remove all our clutter. - eval gcj_cleanup [glob -nocomplain -- ${main}.*] [list $main lib${main}.${so_extension}] + eval gcj_cleanup [glob -nocomplain -- ${main}.*] \ + [list $main lib${main}.${so_extension}] return 1 } -- cgit v1.1