diff options
| author | Alan Modra <amodra@gmail.com> | 2018-02-28 18:33:06 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gcc.gnu.org> | 2018-02-28 18:33:06 +1030 |
| commit | 678127a85e78a86d680e33b208e1571dc2dc045f (patch) | |
| tree | e4e4853aa0ec715a20c06aa96e2f27baaba2ce5b | |
| parent | 408e89356c698a8dd3731f38b1f6d9f01212fa34 (diff) | |
| download | gcc-678127a85e78a86d680e33b208e1571dc2dc045f.zip gcc-678127a85e78a86d680e33b208e1571dc2dc045f.tar.gz gcc-678127a85e78a86d680e33b208e1571dc2dc045f.tar.bz2 | |
gcc testsuite changes for new linker messages
GNU ld error messages have changed to comply with the GNU coding
standards.
* lib/prune.exp (prune_gcc_output): Match lower case "in function"
GNU ld message.
* g++.dg/other/anon5.C: Match lower case "bad value" GNU ld message.
From-SVN: r258054
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/anon5.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/prune.exp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b957cb7..e548fc9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-02-28 Alan Modra <amodra@gmail.com> + + * lib/prune.exp (prune_gcc_output): Match lower case "in function" + GNU ld message. + * g++.dg/other/anon5.C: Match lower case "bad value" GNU ld message. + 2018-02-27 Martin Sebor <msebor@redhat.com> PR c++/83871 diff --git a/gcc/testsuite/g++.dg/other/anon5.C b/gcc/testsuite/g++.dg/other/anon5.C index 2a6f57f..ee4601e 100644 --- a/gcc/testsuite/g++.dg/other/anon5.C +++ b/gcc/testsuite/g++.dg/other/anon5.C @@ -4,7 +4,7 @@ // Ignore additional message on powerpc-ibm-aix // { dg-prune-output "obtain more information" } */ // Ignore additional messages on Linux/x86 with PIE -// { dg-prune-output "Bad value" } */ +// { dg-prune-output "\[Bb\]ad value" } */ namespace { struct c diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index 2f26c6f..1e11dc9 100644 --- a/gcc/testsuite/lib/prune.exp +++ b/gcc/testsuite/lib/prune.exp @@ -31,7 +31,7 @@ proc prune_gcc_output { text } { # Handle any freeform regexps. set text [handle-dg-regexps $text] - regsub -all "(^|\n)(\[^\n\]*: )?In ((static member |lambda )?function|member|method|(copy )?constructor|destructor|instantiation|substitution|program|subroutine|block-data)\[^\n\]*" $text "" text + regsub -all "(^|\n)(\[^\n\]*: \[iI\]|I)n ((static member |lambda )?function|member|method|(copy )?constructor|destructor|instantiation|substitution|program|subroutine|block-data)\[^\n\]*" $text "" 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 |