From: Alexandre Oliva Date: Fri, 12 Jun 2020 08:08:33 +0000 (-0300) Subject: match any program name when pruning collect messages X-Git-Tag: basepoints/gcc-12~7008 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eda72164ade26fe3886515dd55dd9716ff076140;p=thirdparty%2Fgcc.git match any program name when pruning collect messages When collect* programs have an executable suffix, they may include it in their outputs. Match them when pruning gcc output, making room for other program names to print them. for gcc/testsuite/ChangeLog * lib/prune.exp (prune_gcc_output): Match any executable name in collect messages. --- diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index eea4bf383a78..1c776249f1af 100644 --- a/gcc/testsuite/lib/prune.exp +++ b/gcc/testsuite/lib/prune.exp @@ -38,8 +38,8 @@ proc prune_gcc_output { text } { regsub -all "(^|\n)\[^\n\]*: in .constexpr. expansion \[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*: in requirements \[^\n\]*" $text "" text regsub -all "(^|\n) inlined from \[^\n\]*" $text "" text - regsub -all "(^|\n)collect2: error: ld returned \[^\n\]*" $text "" text - regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $text "" text + regsub -all "(^|\n)\[^\n\]*: error: ld returned \[^\n\]*" $text "" 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