diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index 190367c44e0f7d5cd5ece03075701f2d20ec13a3..06904f96fa485cce0c98a171fd7c7af863e0da45 100644 --- a/gcc/testsuite/lib/prune.exp +++ b/gcc/testsuite/lib/prune.exp @@ -48,7 +48,11 @@ proc prune_gcc_output { text } { regsub -all "(^|\n)\[^\n\]*: re(compiling|linking)\[^\n\]*" $text "" text regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text regsub -all "(^|\n)\[0-9\]\[0-9\]* errors\." $text "" text - regsub -all "(^|\n)(In file included|\[ \]+from)\[^\n\]*" $text "" text + + # Diagnostic inclusion stack + regsub -all "(^|\n)(In file)?\[ \]+included from \[^\n\]*" $text "" text + regsub -all "(^|\n)\[ \]+from \[^\n\]*" $text "" text + regsub -all "(^|\n)(In|of) module( \[^\n \]*,)? imported at \[^\n\]*" $text "" text # Ignore informational notes. regsub -all "(^|\n)\[^\n\]*: note: \[^\n\]*" $text "" text @@ -128,8 +132,8 @@ proc prune_file_path { text } { # footnote. proc prune_ices { text } { - regsub -all "(^|\n)\[^\n\]*: internal compiler error:.*for instructions\[^\n\]*" $text "" text - regsub -all "(^|\n|')*Internal compiler error:.*for instructions\[^\n\]*" $text "" text + regsub -all "(^|\n)\[^\n\]*: internal compiler error:.*\nSee \[^\n\]*" $text "" text + regsub -all "(^|\n|')*Internal compiler error:.*\nSee \[^\n\]*" $text "" text return $text }