From eae68c434f2163326b904079fb475b4b28981c69 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 23 Nov 2020 10:34:22 -0800 Subject: [PATCH] testsuite: Adjust pruning Here is the patch to adjust the include-stack pruning messages to also strip out c++ modules. The ICE regexp was a little too strict such that if someone overrides the bug-reporting URL it doesn't trigger. May as well relax it too. gcc/testsuite/ * lib/prune.exp (prune_gcc_output): Adjust include stack pruning for modules. (print_ices): Relax regexp. --- gcc/testsuite/lib/prune.exp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index 190367c..06904f9 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 } -- 2.7.4