diff options
| author | Tom Tromey <tromey@redhat.com> | 2004-12-21 01:01:08 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-12-21 01:01:08 +0000 |
| commit | d2b55bc5592e79c375a73647d8031c4af403aec2 (patch) | |
| tree | 920eb8f33e0b95a1a95c23cc88d9a8c8c2d866aa /libjava/testsuite/libjava.jni | |
| parent | 90d8362105e5fcdbb0e8da463f3315c344e8d2b3 (diff) | |
| download | gcc-d2b55bc5592e79c375a73647d8031c4af403aec2.zip gcc-d2b55bc5592e79c375a73647d8031c4af403aec2.tar.gz gcc-d2b55bc5592e79c375a73647d8031c4af403aec2.tar.bz2 | |
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
Diffstat (limited to 'libjava/testsuite/libjava.jni')
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 11 |
1 files changed, 6 insertions, 5 deletions
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 } |