* lib/gas-defs.exp (gas_test_error): Mark internal error/assertion

	failures seen in output as fails.  Also record output being
	matched for fails.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index bc4eb13349ceb996aca43b1bc325fe50d0a4d622..bf4e234ab099abafc6d2f3f1f48827dbc7fc1d95 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index 07d6445938ee25fbd95daae9809c209a64692871..06bf04ccac8806d73f0a369a0e500b0c27368746 100644 (file)
--- 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"
     }
 }