libjava.exp: Add "xfail-byte-output" and "xfail-source-output".
* lib/libjava.exp: Add "xfail-byte-output" and "xfail-source-output". Don't display expected and actual output for a failed output test. * libjava.lang/ArrayStore.java: New file. * libjava.lang/ArrayStore.out: New file. * libjava.lang/ArrayStore.xfail: New file. xfail-byte-output. * libjava.lang/ArrayStore2.java: New file. * libjava.lang/ArrayStore2.out: New file. * libjava.lang/ArrayStore2.xfail: New file. xfail-source-output. From-SVN: r49888
This commit is contained in:
committed by
Bryce McKinlay
parent
6ea868b758
commit
a2139e0c48
@@ -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
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user