Skip to content

Commit

Permalink
gcc testsuite changes for new linker messages
Browse files Browse the repository at this point in the history
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.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258054 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
amodra committed Feb 28, 2018
1 parent d4ce94c commit 4a96550
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions gcc/testsuite/ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gcc/testsuite/g++.dg/other/anon5.C
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gcc/testsuite/lib/prune.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4a96550

Please sign in to comment.