* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41026 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 25 deletions

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 14be4749946..1fca9f400f6 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -374,10 +374,8 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
 
 	fail "$errname compilation from source"
 	if {[info exists opts(xfail-gcj)] || ! [info exists opts(no-exec)]} {
-	    setup_xfail "*-*-*"
-	    fail "$errname execution from source compiled test"
-	    setup_xfail "*-*-*"
-	    fail "$errname output from source compiled test"
+	    untested "$errname execution from source compiled test"
+	    untested "$errname output from source compiled test"
 	}
 	return
     }
@@ -400,8 +398,7 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
     }
     $status "$errname execution from source compiled test"
     if { $status != "pass" } {
-	setup_xfail "*-*-*"
-	fail "$errname execution from source compiled test"
+	untested "$errname output from source compiled test"
 	return;
     }
 
@@ -488,13 +485,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
 	    return
 	}
 	fail "$errname byte compilation"
-	setup_xfail "*-*-*"
-	fail "$errname compilation from bytecode"
+	untested "$errname compilation from bytecode"
 	if {! [info exists opts(no-exec)]} {
-	    setup_xfail "*-*-*"
-	    fail "$errname execution from bytecode->native test"
-	    setup_xfail "*-*-*"
-	    fail "$errname output from bytecode->native test"
+	    untested "$errname execution from bytecode->native test"
+	    untested "$errname output from bytecode->native test"
 	}
 	return
     }
@@ -520,14 +514,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
 
     if {[string match "*parse error*" $main_name]
 	|| [string match "*parse error*" $class_out]} {
-	# Do the remaining fails.
-	setup_xfail "*-*-*"
-	fail "$errname compilation from bytecode"
+	untested "$errname compilation from bytecode"
 	if {! [info exists opts(no-exec)]} {
-	    setup_xfail "*-*-*"
-	    fail "$errname execution from bytecode->native test"
-	    setup_xfail "*-*-*"
-	    fail "$errname output from bytecode->native test"
+	    untested "$errname execution from bytecode->native test"
+	    untested "$errname output from bytecode->native test"
 	}
 	return
     }
@@ -603,11 +593,9 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
     if { $x != "" } {
 	verbose "target_compile failed: $x" 2
 	fail "$errname compilation from bytecode"
-	setup_xfail "*-*-*"
 	if {! [info exists opts(no-exec)]} {
-	    fail "$errname execution from bytecode->native test"
-	    setup_xfail "*-*-*"
-	    fail "$errname output from bytecode->native test"
+	    untested "$errname execution from bytecode->native test"
+	    untested "$errname output from bytecode->native test"
 	}
 	return;
     }
@@ -625,8 +613,7 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
     }
     $status "$errname execution from bytecode->native test"
     if { $status != "pass" } {
-	setup_xfail "*-*-*"
-	fail "$errname output from bytecode->native test"
+	untested "$errname output from bytecode->native test"
 	return;
     }