prune.exp (prune_gcc_output): Prune "At global scope" messages

2002-01-21  David.Billinghurst <David.Billinghurst@riotinto.com>

	* lib/prune.exp (prune_gcc_output): Prune "At global scope"
	messages
	* g++.dg/other/deprecated.C: Remove dg-bogus comment for
	"At global scope" warning
	* g++.dg/ext/align1.C: Change cygwin test for alignment
	from db-bogus to dg-warning

From-SVN: r49044

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d77121..9fd7c57 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-21  David.Billinghurst <David.Billinghurst@riotinto.com>
+
+       * lib/prune.exp (prune_gcc_output): Prune "At global scope"
+       messages
+       * g++.dg/other/deprecated.C: Remove dg-bogus comment for
+       "At global scope" warning
+       * g++.dg/ext/align1.C: Change cygwin test for alignment
+       from db-bogus to dg-warning
+
 2002-01-21  Zack Weinberg  <zack@codesourcery.com>
 
        * g77.f-torture/compile/cpp2.F: New test.

diff --git a/gcc/testsuite/g++.dg/ext/align1.C b/gcc/testsuite/g++.dg/ext/align1.C
index b7a8511..23dcf74 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/align1.C
+++ b/gcc/testsuite/g++.dg/ext/align1.C
@@ -8,10 +8,10 @@ typedef float at[4][4] __attribute__ ((aligned (64)));
 float dummy[4][4][15];
 
 static volatile at a1[15];
-// { dg-bogus "object file alignment" "" { xfail i?86-pc-cygwin } 10 }
+// { dg-warning "object file alignment" "" { target i?86-pc-cygwin } 10 }
 
 float f1 __attribute__ ((aligned (64)));
-// { dg-bogus "object file alignment" "" { xfail i?86-pc-cygwin } 13 }
+// { dg-warning "object file alignment" "" { target i?86-pc-cygwin } 13 }
 
 int main()
 {

diff --git a/gcc/testsuite/g++.dg/other/deprecated.C b/gcc/testsuite/g++.dg/other/deprecated.C
index 7d9f587..40d9dba 100644 (file)
--- a/gcc/testsuite/g++.dg/other/deprecated.C
+++ b/gcc/testsuite/g++.dg/other/deprecated.C
@@ -1,7 +1,6 @@
 /* Test __attribute__ ((deprecated)) */
 /* { dg-do compile } */
 /* { dg-options "-Wdeprecated-declarations -fmessage-length=0" } */
-/* { dg-bogus "At global scope" "" { xfail *-*-* } 0 } */
 
 #if 1
 typedef int INT1 __attribute__((deprecated));
@@ -54,9 +53,9 @@ int func1()
    int (*pf)() = f1;                   /* { dg-warning "`f1' is deprecated" "" } */
 
    z = w + x + y + g1 + g2 + g3;       /* { dg-warning "`x' is deprecated" "" } */
-                                       /* { dg-warning "`y' is deprecated" "" { target *-*-* } 56 } */
-                                       /* { dg-warning "`g2' is deprecated" "" { target *-*-* } 56 } */
-                                       /* { dg-warning "`g3' is deprecated" "" { target *-*-* } 56 } */
+                                       /* { dg-warning "`y' is deprecated" "" { target *-*-* } 55 } */
+                                       /* { dg-warning "`g2' is deprecated" "" { target *-*-* } 55 } */
+                                       /* { dg-warning "`g3' is deprecated" "" { target *-*-* } 55 } */
    return f1();                        /* { dg-warning "`f1' is deprecated" "" } */
 }
 
@@ -72,7 +71,7 @@ int func2(S1 *p)
   p->u1.field5 = g1 + p->field7;
   p->u2.field9;                                /* { dg-warning "`u2' is deprecated" "" } */
   return p->u1.field6 + p->field8;     /* { dg-warning "`field6' is deprecated" "" } */
-                                       /* { dg-warning "`field8' is deprecated" "" { target *-*-* } 74 } */
+                                       /* { dg-warning "`field8' is deprecated" "" { target *-*-* } 73 } */
 }
 
 struct SS1 {

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index 35ace69..eb391c6 100644 (file)
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -20,7 +20,7 @@ proc prune_gcc_output { text } {
     #send_user "Before:$text\n"
 
     regsub -all "(^|\n)\[^\n\]*: In (function|member|method|constructor|instantiation) \[^\n\]*" $text "" text
-    regsub -all "(^|\n)\[^\n\]*: At top level:\[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text
     regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text