diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/lib/old-dejagnu.exp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f0cc322..a21b34a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,7 @@ 2000-08-23 Jason Merrill <jason@redhat.com> - * lib/old-dejagnu.exp: Also ignore "In member function ". + * lib/old-dejagnu.exp: Also ignore "In member function" and + "At global scope". 2000-08-23 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> diff --git a/gcc/testsuite/lib/old-dejagnu.exp b/gcc/testsuite/lib/old-dejagnu.exp index ef291e3..156b60eb 100644 --- a/gcc/testsuite/lib/old-dejagnu.exp +++ b/gcc/testsuite/lib/old-dejagnu.exp @@ -526,10 +526,10 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } { #look to see if this is all thats left, if so, all messages have been handled #send_user "comp_output: $comp_output\n" - regsub -all "(^|\n)\[^\n\]*: In ((member )?function|method) \[^\n\]*" $comp_output "" comp_output + regsub -all "(^|\n)\[^\n\]*: In (.*function|method|.*structor) \[^\n\]*" $comp_output "" comp_output regsub -all "(^|\n)\[^\n\]*: In instantiation of \[^\n\]*" $comp_output "" comp_output regsub -all "(^|\n)\[^\n\]*: instantiated from \[^\n\]*" $comp_output "" comp_output - regsub -all "(^|\n)\[^\n\]*: At top level:\[^\n\]*" $comp_output "" comp_output + regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $comp_output "" comp_output regsub -all "(^|\n)\[^\n\]*file path prefix \[^\n\]* never used" $comp_output "" comp_output regsub -all "(^|\n)\[^\n\]*linker input file unused since linking not done" $comp_output "" comp_output regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $comp_output "" comp_output |