From 336da03cc3a1795942938c6187277b666ce9b86c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 14 Jan 2020 00:22:56 -0500 Subject: [PATCH] Fix dejagnu pruning of constexpr context messages. I wonder why nobody fixed this until now; it's been two years since the diagnostic context output was changed. * lib/prune.exp (prune_gcc_output): Adjust constexpr pattern. --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/lib/prune.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 86e954fb84d..72cdbe7bd44 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-01-14 Jason Merrill + + * lib/prune.exp (prune_gcc_output): Adjust constexpr pattern. + 2020-01-14 Xiong Hu Luo PR ipa/69678 diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index 60402208c37..eea4bf383a7 100644 --- a/gcc/testsuite/lib/prune.exp +++ b/gcc/testsuite/lib/prune.exp @@ -35,7 +35,7 @@ proc prune_gcc_output { text } { regsub -all "(^|\n)\[^\n\]*(: )?At (top level|global scope):\[^\n\]*" $text "" 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 .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 -- 2.30.2