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 | |
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')
-rw-r--r-- | libjava/testsuite/lib/libjava.exp | 25 | ||||
-rw-r--r-- | libjava/testsuite/libjava.jar/jar.exp | 4 | ||||
-rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 11 | ||||
-rw-r--r-- | libjava/testsuite/libjava.verify/verify.exp | 4 |
4 files changed, 17 insertions, 27 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 62b1f46..71fffc5 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -270,28 +270,17 @@ proc libjava_find_lib {dir name} { # is used with -B. proc libjava_find_spec {} { global objdir - set gp [get_multilibs] - - if {[file exists $gp/libjava/libgcj.spec]} then { - return "$gp/libjava/" - } return "$objdir/../" } -# Find `gij'. +# Find `gij'. Return empty string if not found. proc libjava_find_gij {} { - global base_dir - set gp [get_multilibs] - if {$gp != ""} { - set file $gp/libjava/gij - } else { - set file $base_dir/../gij - } + global base_dir objdir - if {[file exists $file]} { - return $file + if {! [file exists $objdir/../gij]} { + return "" } - return gij + return $objdir/../gij } # Remove a bunch of files. @@ -814,9 +803,9 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e # We purposely ignore errors here; we still want to run the other # appropriate tests. 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 {$INTERPRETER == "yes" && $gij != "gij"} { + if {$INTERPRETER == "yes" && $gij != ""} { libjava_invoke $errname "gij test" opts $gij \ $inpfile $resultfile "" $main_name } diff --git a/libjava/testsuite/libjava.jar/jar.exp b/libjava/testsuite/libjava.jar/jar.exp index 7f4c792..6556583 100644 --- a/libjava/testsuite/libjava.jar/jar.exp +++ b/libjava/testsuite/libjava.jar/jar.exp @@ -20,9 +20,9 @@ proc gcj_jar_interpret {jarfile} { global INTERPRETER srcdir 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 {$INTERPRETER != "yes" || $gij == "gij"} { + if {$INTERPRETER != "yes" || $gij == ""} { untested "$jarfile execution - gij test" untested "$jarfile output - gij test" return 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 } diff --git a/libjava/testsuite/libjava.verify/verify.exp b/libjava/testsuite/libjava.verify/verify.exp index 76c9b00..4abdc18 100644 --- a/libjava/testsuite/libjava.verify/verify.exp +++ b/libjava/testsuite/libjava.verify/verify.exp @@ -61,9 +61,9 @@ proc gcj_verify_run {} { set gij [libjava_find_gij] set interpret 1 - # 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 {$INTERPRETER != "yes" || $gij == "gij"} { + if {$INTERPRETER != "yes" || $gij == ""} { set interpret 0 } |