[gcc(refs/users/guojiufu/heads/personal-branch)] match any program name when pruning collect messages
Jiu Fu Guo
guojiufu@gcc.gnu.org
Sat Jun 13 02:58:54 GMT 2020
https://gcc.gnu.org/g:eda72164ade26fe3886515dd55dd9716ff076140
commit eda72164ade26fe3886515dd55dd9716ff076140
Author: Alexandre Oliva <oliva@adacore.com>
Date: Fri Jun 12 05:08:33 2020 -0300
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:
---
gcc/testsuite/lib/prune.exp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index eea4bf383a7..1c776249f1a 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
More information about the Gcc-cvs
mailing list