Commit b6dabe89 by Zack Weinberg

libjava.exp: Correct typo...

	* testsuite/lib/libjava.exp: Correct typo: 'output from source
	compiled test', not 'execution from source compiled test'.
	Use UNTESTED, not XFAIL, for tests which are not run because
	they depend on a previous test which failed.

From-SVN: r41026
parent 212a2676
...@@ -374,10 +374,8 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile ...@@ -374,10 +374,8 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
fail "$errname compilation from source" fail "$errname compilation from source"
if {[info exists opts(xfail-gcj)] || ! [info exists opts(no-exec)]} { if {[info exists opts(xfail-gcj)] || ! [info exists opts(no-exec)]} {
setup_xfail "*-*-*" untested "$errname execution from source compiled test"
fail "$errname execution from source compiled test" untested "$errname output from source compiled test"
setup_xfail "*-*-*"
fail "$errname output from source compiled test"
} }
return return
} }
...@@ -400,8 +398,7 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile ...@@ -400,8 +398,7 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
} }
$status "$errname execution from source compiled test" $status "$errname execution from source compiled test"
if { $status != "pass" } { if { $status != "pass" } {
setup_xfail "*-*-*" untested "$errname output from source compiled test"
fail "$errname execution from source compiled test"
return; return;
} }
...@@ -488,13 +485,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e ...@@ -488,13 +485,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
return return
} }
fail "$errname byte compilation" fail "$errname byte compilation"
setup_xfail "*-*-*" untested "$errname compilation from bytecode"
fail "$errname compilation from bytecode"
if {! [info exists opts(no-exec)]} { if {! [info exists opts(no-exec)]} {
setup_xfail "*-*-*" untested "$errname execution from bytecode->native test"
fail "$errname execution from bytecode->native test" untested "$errname output from bytecode->native test"
setup_xfail "*-*-*"
fail "$errname output from bytecode->native test"
} }
return return
} }
...@@ -520,14 +514,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e ...@@ -520,14 +514,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
if {[string match "*parse error*" $main_name] if {[string match "*parse error*" $main_name]
|| [string match "*parse error*" $class_out]} { || [string match "*parse error*" $class_out]} {
# Do the remaining fails. untested "$errname compilation from bytecode"
setup_xfail "*-*-*"
fail "$errname compilation from bytecode"
if {! [info exists opts(no-exec)]} { if {! [info exists opts(no-exec)]} {
setup_xfail "*-*-*" untested "$errname execution from bytecode->native test"
fail "$errname execution from bytecode->native test" untested "$errname output from bytecode->native test"
setup_xfail "*-*-*"
fail "$errname output from bytecode->native test"
} }
return return
} }
...@@ -603,11 +593,9 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e ...@@ -603,11 +593,9 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
if { $x != "" } { if { $x != "" } {
verbose "target_compile failed: $x" 2 verbose "target_compile failed: $x" 2
fail "$errname compilation from bytecode" fail "$errname compilation from bytecode"
setup_xfail "*-*-*"
if {! [info exists opts(no-exec)]} { if {! [info exists opts(no-exec)]} {
fail "$errname execution from bytecode->native test" untested "$errname execution from bytecode->native test"
setup_xfail "*-*-*" untested "$errname output from bytecode->native test"
fail "$errname output from bytecode->native test"
} }
return; return;
} }
...@@ -625,8 +613,7 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e ...@@ -625,8 +613,7 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
} }
$status "$errname execution from bytecode->native test" $status "$errname execution from bytecode->native test"
if { $status != "pass" } { if { $status != "pass" } {
setup_xfail "*-*-*" untested "$errname output from bytecode->native test"
fail "$errname output from bytecode->native test"
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment