Re: [30/32] test harness

[Jeff Law via Gcc-patches]

On 11/3/20 2:18 PM, Nathan Sidwell wrote:
> Here's the test harness change, adding a few more prune cases.
>
>
> 30-test-harness.diff
>
OK

jeff

[30/32] test harness

[Nathan Sidwell]

Here's the test harness change, adding a few more prune cases.

--
Nathan Sidwell

diff --git c/gcc/testsuite/lib/prune.exp w/gcc/testsuite/lib/prune.exp
index 190367c44e0..5d051b99def 100644
--- c/gcc/testsuite/lib/prune.exp
+++ w/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 +133,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
 }