On Thu, Feb 27, 2020 at 9:17 PM Alexandre Oliva <ol...@adacore.com> wrote:
>
>
> Testing on platforms with an executable suffix gets a few excess output
> failures because e.g. collect2.exe errors do not get pruned.
>
> I'm not sure it's appropriate for the error to not omit the host
> platform's executable suffix, just as it omits directory components from
> argv[0], so I'm undecided between fixing collect2.c's initialization of
> progname or extending the regexp, as in the (untested) patchlet below.
>
> Any preferences?
>
>
> diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
> index eea4bf3..6d6a7fe 100644
> --- a/gcc/testsuite/lib/prune.exp
> +++ b/gcc/testsuite/lib/prune.exp
> @@ -38,7 +38,7 @@ 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)collect2(\.exe)?: error: ld returned \[^\n\]*" $text
> "" text
If you touch that line
You may as well also touch this line too:
> regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $text "" text
Thanks,
Andrew Pinski
> regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text
> regsub -all "(^|\n)\[0-9\]\[0-9\]* errors\." $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 The darkest places in hell are reserved for those
> who maintain their neutrality in times of moral crisis. -- Dante Alighieri
