old-dejagnu.exp: Revise handling of `Internal compiler error'.

        * lib/old-dejagnu.exp: Revise handling of `Internal compiler
        error'.

From-SVN: r21846

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d361e4e12d2cd486026afb548ae86abb8e9184f8..ec9f8302fb643c8d8d5732ffa6827259724ad31d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+1998-08-09  Mark Mitchell  <mark@markmitchell.com>
+
+       * lib/old-dejagnu.exp: Revise handling of `Internal compiler
+       error'.
+
 Tue Aug 18 19:19:50 1998  Jeffrey A Law  (law@cygnus.com)
 
        * gcc.c-torture/execute/*.x: Some updates for the h8300 targets.

diff --git a/gcc/testsuite/lib/old-dejagnu.exp b/gcc/testsuite/lib/old-dejagnu.exp
index e029b23e00daf07301c19e7d16b167817bc1cfdb..52f9c0cae0a9c40746e5d154d96c36cdcd3c4f02 100644 (file)
--- a/gcc/testsuite/lib/old-dejagnu.exp
+++ b/gcc/testsuite/lib/old-dejagnu.exp
@@ -404,6 +404,11 @@ proc old-dejagnu { compiler prog cflagsx default_cflags libs } {
        remote_file build delete $output
        return 1
     }
+    if [string match "*Internal compiler error*" $comp_output] then {
+        fail "$name caused compiler crash"
+       remote_file build delete $output
+       return 1
+    }
 
     #send_user "\nold_dejagnu.exp: comp_output1 = :$comp_output:\n\n"
     #send_user "\nold_dejagnu.exp: message = :$message:\n\n"
@@ -426,13 +431,7 @@ proc old-dejagnu { compiler prog cflagsx default_cflags libs } {
        }
        set last_line $line
 
-       # If we crashed on this line, all tests fail.
-       if [regexp "(^|\n)\[^\n\]+:$line: Internal compiler error\[^\n\]*" $comp_output ] {
-           regsub -all "(^|\n)\[^\n\]+:$line:\[^\n\]*" $comp_output "" comp_output
-            set comp_output [string trimleft $comp_output]
-           set ok fail
-           set uhoh fail
-       } elseif [regsub -all "(^|\n)\[^\n\]+:$line:\[^\n\]*" $comp_output "" comp_output] {
+       if [regsub -all "(^|\n)\[^\n\]+:$line:\[^\n\]*" $comp_output "" comp_output] {
             set comp_output [string trimleft $comp_output]
            set ok pass
            set uhoh fail