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.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 86e954fb84d0f461fbfebf505c543657657150e0..72cdbe7bd44678162fe0feba90da122af8667d2b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-14  Jason Merrill  <jason@redhat.com>
+
+       * lib/prune.exp (prune_gcc_output): Adjust constexpr pattern.
+
 2020-01-14  Xiong Hu Luo  <luoxhu@linux.ibm.com>
 
        PR ipa/69678

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index 60402208c375c572766a8adce0def3cf4b400fe5..eea4bf383a7844f4a28a30d1311e3b1bfd89469e 100644 (file)
--- 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