On May 26, 2020, Alexandre Oliva <ol...@adacore.com> wrote:
> On May 19, 2020, Joseph Myers <jos...@codesourcery.com> wrote:
>> Allowing a missing executable name is reasonable enough, but I was
>> actually thinking that the messages should print "gcc" or whatever command
>> the user ran in place of "collect2".
> Should we make the regexps '\[^\n\]*', as in so many other pruned
> messages?
Like this. Regstrapped on x86_64-linux-gnu. Ok to install?
match any program name when pruning collect messages
From: Alexandre Oliva <ol...@adacore.com>
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.
---
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 eea4bf3..1c77624 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
--
Alexandre Oliva, freedom fighter he/him https://FSFLA.org/blogs/lxo/
Free Software Evangelist Stallman was right, but he's left :(
GNU Toolchain Engineer Live long and free, and prosper ethically
