diff options
| author | Jason Merrill <jason@redhat.com> | 2020-01-14 00:22:56 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-01-14 11:57:34 -0500 |
| commit | 336da03cc3a1795942938c6187277b666ce9b86c (patch) | |
| tree | 0dd8575bee656f91fde44bb28d6368122f91fc6e | |
| parent | 780e19f87c8a69e425b6f98703e6931f49518a80 (diff) | |
| download | gcc-336da03cc3a1795942938c6187277b666ce9b86c.zip gcc-336da03cc3a1795942938c6187277b666ce9b86c.tar.gz gcc-336da03cc3a1795942938c6187277b666ce9b86c.tar.bz2 | |
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.
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/prune.exp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 86e954f..72cdbe7 100644 --- 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 6040220..eea4bf3 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 |