On Tue, 11 Nov 2025 at 16:29, Jason Merrill <[email protected]> wrote:
>
> Tested x86_64-pc-linux-gnu, OK for trunk?
Makes sense - OK
>
> -- 8< --
>
> I needed to add module context to dg-prune for libstdc++, and figured it
> made sense to sync it with the GCC version rather than maintain slightly
> different approaches to stripping the same messages.
>
> libstdc++-v3/ChangeLog:
>
> * testsuite/lib/prune.exp: Sync with gcc prune.exp.
> ---
> libstdc++-v3/testsuite/lib/prune.exp | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/libstdc++-v3/testsuite/lib/prune.exp
> b/libstdc++-v3/testsuite/lib/prune.exp
> index a9a29937e43..93d3d526019 100644
> --- a/libstdc++-v3/testsuite/lib/prune.exp
> +++ b/libstdc++-v3/testsuite/lib/prune.exp
> @@ -53,12 +53,13 @@ proc libstdc++-dg-prune { system text } {
> regsub -all "(^|\n)\[^\n\]*: (recursively )?required \[^\n\]*" $text
> "" text
> regsub -all "(^|\n)\[^\n\]*: . skipping \[0-9\]* instantiation
> contexts \[^\n\]*" $text "" text
> regsub -all "(^|\n)\[^\n\]*: in .constexpr. expansion \[^\n\]*" $text
> "" text
> - regsub -all "(^|\n)\[^\n\]*: in requirements .with\[^\n\]*" $text ""
> text
> - regsub -all "(^|\n)\[^\n\]*: in requirements with\[^\n\]*" $text ""
> text
> + regsub -all "(^|\n)\[^\n\]*: in requirements \[^\n\]*" $text "" text
> regsub -all "(^|\n) inlined from \[^\n\]*" $text "" text
> - # Why doesn't GCC need these to strip header context?
> - regsub -all "(^|\n)In file included from \[^\n\]*" $text "" text
> - regsub -all "(^|\n)\[ \t\]*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.
> #TODO As this isn't even using 'gcc-dg.exp', cannot consider its
>
> base-commit: 52a24bcecd388ab6e7d4e6500809fc761f6e7ca5
> --
> 2.51.0
>
