aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite/lib/libjava.exp
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/testsuite/lib/libjava.exp')
-rw-r--r--libjava/testsuite/lib/libjava.exp14
1 files changed, 10 insertions, 4 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 67f9b6e..50996aa 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -510,12 +510,13 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
if {[info exists opts(xfail-output)]} {
setup_xfail *-*-*
}
+ if {[info exists opts(xfail-source-output)]} {
+ setup_xfail *-*-*
+ }
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"
fail "$errname output from source compiled test"
}
close $id;
@@ -737,6 +738,9 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
if {[info exists opts(xfail-output)]} {
setup_xfail *-*-*
}
+ if {[info exists opts(xfail-byte-output)]} {
+ setup_xfail *-*-*
+ }
if {$options == "regexp_match"} {
if [regexp $expected $output] {
set passed 1;
@@ -750,8 +754,6 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
pass "$errname output from bytecode->native test"
eval gcj_cleanup $removeList
} else {
- clone_output "expected was $expected"
- clone_output "output was $output"
fail "$errname output from bytecode->native test"
}
close $id;
@@ -774,6 +776,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
# `xfail-exec' exec will fail
# `xfail-output'
# output will be wrong
+# `xfail-byte-output'
+# output will be wrong when compiled from bytecode
+# `xfail-source-output'
+# output will be wrong when compiled from source code
# `need-threads'
# test relies on thread support
#