diff options
| -rw-r--r-- | gas/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/testsuite/lib/gas-defs.exp | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index bc4eb13..bf4e234 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2009-09-21 Maciej W. Rozycki <macro@linux-mips.org> + * lib/gas-defs.exp (gas_test_error): Mark internal error/assertion + failures seen in output as fails. Also record output being + matched for fails. + +2009-09-21 Maciej W. Rozycki <macro@linux-mips.org> + * gas/mips/eret-1.d: Adjust regexps for robustness. * gas/mips/eret-2.d: Likewise. * gas/mips/eret-3.d: Likewise. diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp index 07d6445..06bf04c 100644 --- a/gas/testsuite/lib/gas-defs.exp +++ b/gas/testsuite/lib/gas-defs.exp @@ -222,14 +222,14 @@ proc gas_test_error { file as_opts testname } { global comp_output gas_run $file $as_opts ">/dev/null" - if ![string match "" $comp_output] then { - send_log "$comp_output\n" - verbose "$comp_output" 3 - } - if [string match "" $comp_output] then { - fail "$testname" - } else { + send_log "$comp_output\n" + verbose "$comp_output" 3 + if { ![string match "" $comp_output] + && ![string match "*Assertion failure*" $comp_output] + && ![string match "*Internal error*" $comp_output] } then { pass "$testname" + } else { + fail "$testname" } } |