+2001-06-08 Tom Tromey <tromey@redhat.com>
+
+ Fix for PR libgcj/2874:
+ * libjava.mauve/mauve.exp (gcj_run_mauve_tests): New proc.
+ (test_mauve): Return 0 on failure.
+ * lib/libjava.exp (test_libjava_from_source): Remove generated
+ files if test is successful.
+ (test_libjava_from_javac): Likewise.
+ (gcj_cleanup): New proc.
+
2001-06-05 Jeff Sturm <jsturm@one-point.com>
* lib/libjava.exp (libjava_arguments): Build with `-no-install'
return ""
}
+# Remove a bunch of files.
+proc gcj_cleanup {args} {
+ foreach file $args {
+ if {[string match *.o $file]} {
+ verbose "removing [file rootname $file].lo"
+ file delete -force [file rootname $file].lo
+ }
+ file delete -force -- $file
+ verbose "removing $file"
+ }
+ # It is simplest to do this instead of trying to figure out what
+ # bits in .libs ought to be removed.
+ catch {system "rm -rf .libs"}
+}
+
# Compute arguments needed for compiler. MODE is a libtool mode:
# either compile or link.
proc libjava_arguments {{mode compile}} {
set errname "$errname $compile_args"
}
+ set removeList [list $executable]
+
set x [prune_warnings \
[libjava_tcompile $srcfile "$executable" $target $args]]
if {[info exists opts(xfail-gcj)]} {
if {[info exists opts(shouldfail)]} {
pass "$errname compilation from source"
+ eval gcj_cleanup $removeList
return
}
untested "$errname execution from source compiled test"
untested "$errname output from source compiled test"
}
+ eval gcj_cleanup $removeList
return
}
if {[info exists opts(no-link)]} {
+ eval gcj_cleanup $removeList
return
}
}
if { $passed == 1 } {
pass "$errname output from source compiled test"
+ eval gcj_cleanup $removeList
} else {
clone_output "expected was $expected"
clone_output "output was $output"
}
pass "$errname byte compilation"
+ set removeList {}
+
# Find name to use for --main, and name of all class files.
set jvscan [find_jvscan]
verbose "jvscan is $jvscan"
lappend class_files $objdir/$file.class
}
+ eval lappend removeList $class_files
+
# Usually it is an error for a test program not to have a `main'
# method. However, for no-exec tests it is ok. Treat no-link
# like no-exec here.
set executable [file rootname [file tail $c_file]].o
set x [prune_warnings \
[libjava_tcompile $c_file "$executable" $type $args]]
+ lappend removeList $executable
if {$x != ""} {
break
}
}
} else {
- # This is no evil: we de-listify CLASS_FILES so that we can
+ # This is so evil: we de-listify CLASS_FILES so that we can
# turn around and quote the `$' in it for the shell. I really
# hate DejaGNU. It is so !@#$!@# unpredictable.
set hack ""
foreach stupid $class_files {
set hack "$hack $stupid"
}
+ lappend removeList $executable
set x [prune_warnings \
[libjava_tcompile $hack "$executable" $type $args]]
}
untested "$errname execution from bytecode->native test"
untested "$errname output from bytecode->native test"
}
+ eval gcj_cleanup $removeList
return
}
$status "$errname execution from bytecode->native test"
if { $status != "pass" } {
untested "$errname output from bytecode->native test"
- return;
+ return
}
verbose "resultfile is $resultfile"
}
if { $passed == 1 } {
pass "$errname output from bytecode->native test"
+ eval gcj_cleanup $removeList
} else {
clone_output "expected was $expected"
clone_output "output was $output"
return [lsort [array names uses]]
}
-# Run all the Mauve tests.
+# Run all the Mauve tests. Return 1 on success, 0 on any failure. If
+# the tests are skipped, that is treated like success.
proc test_mauve {} {
global srcdir objdir subdir env
if {! [info exists env(MAUVEDIR)]} then {
verbose "MAUVEDIR not set; not running Mauve tests"
- return
+ return 1
}
# Run in subdir so we don't overwrite our own Makefile.
} msg]} then {
fail "Mauve configure"
verbose "configure failed with $msg"
- return
+ return 0
}
pass "Mauve configure"
} msg]} then {
fail "Mauve build"
verbose "build failed with $msg"
- return
+ return 0
}
pass "Mauve build"
set srcfile $full_srcdir/$subdir/DejaGNUTestHarness.java
if {! [bytecompile_file $srcfile [pwd] $env(MAUVEDIR):[pwd]]} then {
fail "Compile DejaGNUTestHarness.java"
- return
+ return 0
}
pass "Compile DejaGNUTestHarness.java"
lappend objlist $obj
}
if {! $ok} then {
- return
+ return 0
}
+ set proc_ok 1
set Executable DejaGNUTestHarness
foreach file $choices {
# Turn `java/lang/Foo.java' into `java.lang.Foo'.
}
}
if {! $ok} then {
+ set proc_ok 0
continue
}
set x [prune_warnings [target_compile [concat $uses($file) $objlist] \
$Executable executable $link_args]]
if {$x != ""} then {
+ set proc_ok 0
fail "Link for $class"
continue
}
if {$what == "PASS" || $what == "XPASS"} then {
pass $msg
} else {
+ set proc_ok 0
fail $msg
}
}
}
}
+
+ return $proc_ok
}
# Run all the Mauve tests in a sim environment. In this case, the
# program cannot use argv[] because there's no way to pass in the
# command line, so tha name of the class to test is substituted by
-# patching the source of the DejaGNUTestHarness.
+# patching the source of the DejaGNUTestHarness. Return 1 on success,
+# 0 on any failure. If the tests are skipped, that is treated like
+# success.
proc test_mauve_sim {} {
global srcdir subdir env
if {! [info exists env(MAUVEDIR)]} then {
verbose "MAUVEDIR not set; not running Mauve tests"
- return
+ return 1
}
# Run in subdir so we don't overwrite our own Makefile.
} msg]} then {
fail "Mauve configure"
verbose "configure failed with $msg"
- return
+ return 0
}
pass "Mauve configure"
} msg]} then {
fail "Mauve build"
verbose "build failed with $msg"
- return
+ return 0
}
pass "Mauve build"
lappend objlist $obj
}
if {! $ok} then {
- return
+ return 0
}
lappend objlist gnu/testlet/DejaGNUTestHarness.o
+ set proc_ok 1
set Executable DejaGNUTestHarness
foreach file $choices {
# Turn `java/lang/Foo.java' into `java.lang.Foo'.
}
}
if {! $ok} then {
+ set proc_ok 0
continue
}
if {! [bytecompile_file [pwd]/gnu/testlet/$srcfile [pwd]/gnu/testlet \
$env(MAUVEDIR):[pwd]]} then {
fail "Compile DejaGNUTestHarness.java"
- return
+ return 0
}
set x [prune_warnings \
gnu/testlet/DejaGNUTestHarness.o object $compile_args]]
if {$x != ""} then {
fail "Compile DejaGNUTestHarness.java"
+ set proc_ok 0
continue
- }
+ }
set x [prune_warnings [target_compile [concat $uses($file) $objlist] \
$Executable executable $link_args]]
if {$x != ""} then {
+ set proc_ok 0
fail "Link for $class"
continue
}
if {$what == "PASS" || $what == "XPASS"} then {
pass $msg
} else {
+ set proc_ok 0
fail $msg
}
}
}
}
+
+ return $proc_ok
}
-# The test_mauve* procs will change the current directory. It's
-# simpler to fix this up here than to keep track of this in the procs.
-set here [pwd]
-if { [board_info target exists is_simulator] } {
- test_mauve_sim
-} else {
- test_mauve
+proc gcj_run_mauve_tests {} {
+ # The test_mauve* procs will change the current directory. It's
+ # simpler to fix this up here than to keep track of this in the
+ # procs.
+ set here [pwd]
+ if { [board_info target exists is_simulator] } {
+ set r [test_mauve_sim]
+ } else {
+ set r [test_mauve]
+ }
+ cd $here
+
+ if {$r} {
+ # No need to keep the build around. FIXME: this knows how the
+ # tests work. This whole file could use a rewrite.
+ system "rm -rf mauve-build"
+ }
}
-cd $here
+
+gcj_run_mauve_tests
projects / gcc.git / commitdiff