aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2000-08-24 01:01:38 -0400
committerJason Merrill <jason@gcc.gnu.org>2000-08-24 01:01:38 -0400
commit06c3db64344808cff109c5d99958e9d58a1adcd0 (patch)
treec9849bf107e9db68b887dc35182336b2e2008d95
parent80d710d2ff4415501a473c38e006eaec71dc42a6 (diff)
downloadgcc-06c3db64344808cff109c5d99958e9d58a1adcd0.zip
gcc-06c3db64344808cff109c5d99958e9d58a1adcd0.tar.gz
gcc-06c3db64344808cff109c5d99958e9d58a1adcd0.tar.bz2
OK, once more:
* lib/old-dejagnu.exp: Also ignore "In member function" and "At global scope". From-SVN: r35934
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/lib/old-dejagnu.exp4
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