prune.exp: Prune "note"s.

	* lib/prune.exp: Prune "note"s.
	* g++.dg/uninit-pred-3_b.C: Remove dg-excess-errors.

	* g++.dg/ext/injected-ttp.C: Specify -std=c++98.
	* g++.dg/template/dependent-expr3.C: Likewise.
	* g++.dg/parse/template7.C: Likewise.
	* g++.old-deja/g++.bugs/900119_01.C: Likewise.
	* g++.old-deja/g++.jason/rfg10.C: Likewise.
	* g++.old-deja/g++.pt/friend38.C: Likewise.
	* g++.old-deja/g++.pt/crash32.C: Likewise.
	* g++.old-deja/g++.other/init4.C: Likewise.
	* g++.old-deja/g++.other/friend8.C: Likewise.

	* g++.dg/ext/complex7.C: Adjust expected output.
	* g++.dg/diagnostic/method1.C: Likewise.
	* g++.dg/parse/parameter-declaration-2.C: Likewise.
	* g++.dg/parse/crash33.C: Likewise.
	* g++.dg/other/warning1.C: Likewise.
	* g++.dg/init/pr29571.C: Likewise.
	* g++.dg/warn/overflow-warn-1.C: Likewise.
	* g++.dg/warn/overflow-warn-3.C: Likewise.
	* g++.dg/warn/overflow-warn-4.C: Likewise.
	* g++.old-deja/g++.oliva/template1.C: Likewise.

From-SVN: r174886

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 54b17c2e96435ba577baca60cbf61a20a2695ddb..d93c01a2a4e63020f27a5eeb34aae3f406ea6601 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,29 @@
 2011-06-09  Jason Merrill  <jason@redhat.com>
 
+       * lib/prune.exp: Prune "note"s.
+       * g++.dg/uninit-pred-3_b.C: Remove dg-excess-errors.
+
+       * g++.dg/ext/injected-ttp.C: Specify -std=c++98.
+       * g++.dg/template/dependent-expr3.C: Likewise.
+       * g++.dg/parse/template7.C: Likewise.
+       * g++.old-deja/g++.bugs/900119_01.C: Likewise.
+       * g++.old-deja/g++.jason/rfg10.C: Likewise.
+       * g++.old-deja/g++.pt/friend38.C: Likewise.
+       * g++.old-deja/g++.pt/crash32.C: Likewise.
+       * g++.old-deja/g++.other/init4.C: Likewise.
+       * g++.old-deja/g++.other/friend8.C: Likewise.
+
+       * g++.dg/ext/complex7.C: Adjust expected output.
+       * g++.dg/diagnostic/method1.C: Likewise.
+       * g++.dg/parse/parameter-declaration-2.C: Likewise.
+       * g++.dg/parse/crash33.C: Likewise.
+       * g++.dg/other/warning1.C: Likewise.
+       * g++.dg/init/pr29571.C: Likewise.
+       * g++.dg/warn/overflow-warn-1.C: Likewise.
+       * g++.dg/warn/overflow-warn-3.C: Likewise.
+       * g++.dg/warn/overflow-warn-4.C: Likewise.
+       * g++.old-deja/g++.oliva/template1.C: Likewise.
+
        * g++.dg/cpp0x/regress/error-recovery1.C: Adjust.
        * g++.dg/parse/template7.C: Adjust.
 

diff --git a/gcc/testsuite/g++.dg/diagnostic/method1.C b/gcc/testsuite/g++.dg/diagnostic/method1.C
index 8e1225d0722459ac013252d458d9d21f7cf83d9e..4a781047ef882d18456e7e31db069a43f70d11e5 100644 (file)
--- a/gcc/testsuite/g++.dg/diagnostic/method1.C
+++ b/gcc/testsuite/g++.dg/diagnostic/method1.C
@@ -18,3 +18,5 @@ baz ()
 {
   bar <int> ();
 }
+
+// { dg-prune-output "without object" }

diff --git a/gcc/testsuite/g++.dg/ext/complex7.C b/gcc/testsuite/g++.dg/ext/complex7.C
index 9d5463f94dcd1d40155b3b661fdb34493af25e77..5b3eead1810f6a1eb8dba536b68fcf8d9bd37649 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/complex7.C
+++ b/gcc/testsuite/g++.dg/ext/complex7.C
@@ -4,3 +4,5 @@ class A
 {
   static const _Complex double x = 1.0 + 2.0i;
 };
+
+// { dg-prune-output "constexpr. needed" }

diff --git a/gcc/testsuite/g++.dg/ext/injected-ttp.C b/gcc/testsuite/g++.dg/ext/injected-ttp.C
index 405bee88cdfb7ce2b163b56dfd1f3339957e310a..5ef4a4ec4f1e5404602ef769314a4c44fc9515c2 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/injected-ttp.C
+++ b/gcc/testsuite/g++.dg/ext/injected-ttp.C
@@ -1,7 +1,7 @@
 // Test for doing the right thing with injected-class-name used as template
 // type argument.  This is an extension from DR 176.
 
-// { dg-options "-pedantic" }
+// { dg-options "-pedantic -std=c++98" }
 
 template <class T>
 struct A { };

diff --git a/gcc/testsuite/g++.dg/init/pr29571.C b/gcc/testsuite/g++.dg/init/pr29571.C
index 9e8e6093ef2fa5ed5b6808ceeb5ddd1626502547..c9bfa28862e3e77e12d5cec42b09cc7d7c761c78 100644 (file)
--- a/gcc/testsuite/g++.dg/init/pr29571.C
+++ b/gcc/testsuite/g++.dg/init/pr29571.C
@@ -3,6 +3,6 @@
 struct A
 {
   static const int i = 0/0 + ""; // { dg-warning "division by zero" }
-  // { dg-error "field initializer is not constant" "" { target *-*-* } 5 }
+  // { dg-error "field initializer is not constant|not a constant-expression" "" { target *-*-* } 5 }
   static const int j = int(i);
 };

diff --git a/gcc/testsuite/g++.dg/other/warning1.C b/gcc/testsuite/g++.dg/other/warning1.C
index 77653a1df13ec2ae3bb469a33f05bcaa63339893..c65ae0ff6efbf02e7009bab7c0fe500187c2a543 100644 (file)
--- a/gcc/testsuite/g++.dg/other/warning1.C
+++ b/gcc/testsuite/g++.dg/other/warning1.C
@@ -7,8 +7,8 @@ extern "C" int printf(const char *, ...);
 
 struct S
 {
-  static const float inf = 1.0f / 0.0f; // { dg-warning "1.0|float|initialization" }
-  static const float nan = 0.0f / 0.0f; // { dg-warning "0.0|float|initialization" }
+  static const float inf = 1.0f / 0.0f; // { dg-warning "1.0|float|initializ" }
+  static const float nan = 0.0f / 0.0f; // { dg-warning "0.0|float|initializ" }
 };
 
 int main()

diff --git a/gcc/testsuite/g++.dg/parse/crash33.C b/gcc/testsuite/g++.dg/parse/crash33.C
index 2ab84df46d3710a8245785943d8fa0fc046fceec..5ccb6529c6ee718b64c3f3002959b6b952bb5783 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/crash33.C
+++ b/gcc/testsuite/g++.dg/parse/crash33.C
@@ -4,5 +4,8 @@
 template<int>
 void foo()
 [
-  throw;       // { dg-error "expected" }
-}              // { dg-error "expected" }
+  throw;
+}
+
+// { dg-prune-output "expected" }
+// { dg-prune-output "array bound" }

diff --git a/gcc/testsuite/g++.dg/parse/parameter-declaration-2.C b/gcc/testsuite/g++.dg/parse/parameter-declaration-2.C
index 7a9a24fb75212f4032bcb8558eedfacea006c951..6116630433f3d5c825258f68f74842c4e967047f 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/parameter-declaration-2.C
+++ b/gcc/testsuite/g++.dg/parse/parameter-declaration-2.C
@@ -1 +1,2 @@
 void f (int i, int p[i]); // { dg-error "use of parameter .i. outside function body" }
+// { dg-prune-output "array bound" }

diff --git a/gcc/testsuite/g++.dg/parse/template7.C b/gcc/testsuite/g++.dg/parse/template7.C
index d7dfef7c11c02c997c21fbb59e270d6558a1c15f..930e259fe1e6d58ea7b8ba78107c9ebd9417dc08 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/template7.C
+++ b/gcc/testsuite/g++.dg/parse/template7.C
@@ -1,3 +1,5 @@
+// { dg-options -std=c++98 }
+
 template <int I>
 void f();                      // { dg-message "note" }
 

diff --git a/gcc/testsuite/g++.dg/template/dependent-expr3.C b/gcc/testsuite/g++.dg/template/dependent-expr3.C
index 97fddbdd8d44819deab9e82215b7c0592216adc6..bf14c49b42bbd378f39e1f3af59f378ade8c3a34 100644 (file)
--- a/gcc/testsuite/g++.dg/template/dependent-expr3.C
+++ b/gcc/testsuite/g++.dg/template/dependent-expr3.C
@@ -1,3 +1,4 @@
+// { dg-options -std=c++98 }
 // { dg-do compile }
 // Origin: jbrandmeyer at users dot sourceforge dot net
 // PR c++/12573: COMPONENT_REFs must be inspected for dependness.

diff --git a/gcc/testsuite/g++.dg/uninit-pred-3_b.C b/gcc/testsuite/g++.dg/uninit-pred-3_b.C
index cfe2113bb6e34de5ca1443aa5667f240fd061b7f..a66e04becb2de2a19cc3dde73ce2a32ace201eb4 100644 (file)
--- a/gcc/testsuite/g++.dg/uninit-pred-3_b.C
+++ b/gcc/testsuite/g++.dg/uninit-pred-3_b.C
@@ -65,7 +65,7 @@ class M {
 
   void P (int64 t)
     {
-      int cc; /* { dg-excess-errors "note: 'cc' was declared here" } */
+      int cc;
       if (!GetC (&cc))
         return;
 

diff --git a/gcc/testsuite/g++.dg/warn/overflow-warn-1.C b/gcc/testsuite/g++.dg/warn/overflow-warn-1.C
index 22c512a4f8f779d4ecb357d9523c28ff9b3756b9..7cd76e74c7afb26607a642dea6de959cb71d8bd3 100644 (file)
--- a/gcc/testsuite/g++.dg/warn/overflow-warn-1.C
+++ b/gcc/testsuite/g++.dg/warn/overflow-warn-1.C
@@ -13,7 +13,7 @@ enum e {
      in the standard).  */
   E2 = 2 || 1 / 0, /* { dg-bogus "warning: division by zero" "" { xfail *-*-* } 14 } */
   E3 = 1 / 0, /* { dg-warning "division by zero" } */
-  /* { dg-error "enumerator value for 'E3' is not an integer constant|not a constant expression" "enum error" { target *-*-* } 15 } */
+  /* { dg-error "enumerator value for 'E3' is not an integer constant|not a constant.expression" "enum error" { target *-*-* } 15 } */
   /* But as in DR#031, the 1/0 in an evaluated subexpression means the
      whole expression violates the constraints.  */
   E4 = 0 * (1 / 0), /* { dg-warning "division by zero" } */

diff --git a/gcc/testsuite/g++.dg/warn/overflow-warn-3.C b/gcc/testsuite/g++.dg/warn/overflow-warn-3.C
index d88c87a53981bdd8f335a78a087d2e40ed14d817..73c0e006f56c862d6ab89537264080fe46860f28 100644 (file)
--- a/gcc/testsuite/g++.dg/warn/overflow-warn-3.C
+++ b/gcc/testsuite/g++.dg/warn/overflow-warn-3.C
@@ -13,7 +13,7 @@ enum e {
      in the standard).  */
   E2 = 2 || 1 / 0, /* { dg-bogus "warning: division by zero" "" { xfail *-*-* } 14 } */
   E3 = 1 / 0, /* { dg-warning "division by zero" } */
-  /* { dg-error "enumerator value for 'E3' is not an integer constant|not a constant expression" "enum error" { target *-*-* } 15 } */
+  /* { dg-error "enumerator value for 'E3' is not an integer constant|not a constant.expression" "enum error" { target *-*-* } 15 } */
   /* But as in DR#031, the 1/0 in an evaluated subexpression means the
      whole expression violates the constraints.  */
   E4 = 0 * (1 / 0), /* { dg-warning "division by zero" } */

diff --git a/gcc/testsuite/g++.dg/warn/overflow-warn-4.C b/gcc/testsuite/g++.dg/warn/overflow-warn-4.C
index 374d29428a802241e65d7b17f79427e9a650e150..24b3959a03494ae0720128d917b49a610c2bf448 100644 (file)
--- a/gcc/testsuite/g++.dg/warn/overflow-warn-4.C
+++ b/gcc/testsuite/g++.dg/warn/overflow-warn-4.C
@@ -13,7 +13,7 @@ enum e {
      in the standard).  */
   E2 = 2 || 1 / 0, /* { dg-bogus "warning: division by zero" "" { xfail *-*-* } } */
   E3 = 1 / 0, /* { dg-warning "division by zero" } */
-  /* { dg-error "enumerator value for 'E3' is not an integer constant|not a constant expression" "enum error" { target *-*-* } 15 } */
+  /* { dg-error "enumerator value for 'E3' is not an integer constant|not a constant.expression" "enum error" { target *-*-* } 15 } */
   /* But as in DR#031, the 1/0 in an evaluated subexpression means the
      whole expression violates the constraints.  */
   E4 = 0 * (1 / 0), /* { dg-warning "division by zero" } */

diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C
index ace4e4b7ac13b73e52e705d1affb2b1ba4b69b6b..0d181c7eeb8218c4982b72b8a812eb93d17262f4 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C
@@ -1,3 +1,4 @@
+// { dg-options "-pedantic-errors -std=c++98" }
 // { dg-do assemble  }
 // g++ 1.36.1 bug 900119_01
 
@@ -8,7 +9,7 @@
 
 // keywords: member declaration, member initialization
 
-// { dg-prune-output "non-static data member initializers" }
+// { dg-prune-output "is a static data member" }
 
 int global_int;
 
@@ -18,7 +19,7 @@ public:
   static int class0_member_1 = 99;             /* { dg-error "" }  */
   int &class0_member_2 = global_int;           /* { dg-error "" }  */
 
-  class0 () : class0_member_2 (global_int) { }  /* { dg-error "" }  */
+  class0 () : class0_member_2 (global_int) { }
 };
 
 
@@ -27,7 +28,7 @@ struct struct0 {
   static int struct0_member_1 = 99;            /* { dg-error "" }  */
   int &struct0_member_2 = global_int;          /* { dg-error "" }  */
 
-  struct0 () : struct0_member_2 (global_int) { } /* { dg-error "" }  */
+  struct0 () : struct0_member_2 (global_int) { }
 };
 
 // g++ does not allow unions to have more than one member with an initializer
@@ -43,7 +44,7 @@ union union1 {
 union union2 {
   int &union2_member_0 = global_int;           /* { dg-error "" }  */
 
-  union2 () : union2_member_0 (global_int) { }  /* { dg-error "" }  */
+  union2 () : union2_member_0 (global_int) { }
 };
 
 int main () { return 0; }

diff --git a/gcc/testsuite/g++.old-deja/g++.jason/rfg10.C b/gcc/testsuite/g++.old-deja/g++.jason/rfg10.C
index 58af19c33644832db276d47a164f6f61f9ebcf4a..8769f5afc4604ab0970c7a786a33ffe74a829b0b 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.jason/rfg10.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/rfg10.C
@@ -1,5 +1,5 @@
 // { dg-do assemble  }
-// { dg-options "-pedantic-errors" }
+// { dg-options "-pedantic-errors -std=c++98" }
 // Bug: g++ doesn't notice the overflow in the enum values.
 
 #include <limits.h>

diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
deleted file mode 100644 (file)
index 995ac91..0000000
--- a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
+++ /dev/null
@@ -1,127 +0,0 @@
-2005-04-03  Alexandre Oliva  <aoliva@redhat.com>
-
-       PR c++/19199
-       * expr2.C: Fixed.
-
-2003-06-04  J"orn Rennecke <joern.rennecke@superh.com>
-
-       * template1.C (bar): Remove xfail marker.
-
-2002-07-06  Alexandre Oliva  <aoliva@redhat.com>
-
-       * linkage1.C, linkage1-main.cc: New test.
-
-2001-02-15  Alexandre Oliva  <aoliva@redhat.com>
-
-       * friend1.C: New test.
-
-2000-05-28  Alexandre Oliva  <aoliva@cygnus.com>
-
-       * expr2.C: New test.
-
-2000-04-19  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
-
-       * stkalign.C: New test.
-
-1999-12-22  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
-
-       * nameret2.C: New test.
-
-       * nameret1.C: New test.
-
-       * template10.C: New test.
-
-1999-11-21  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
-
-       * delete2.C, delete3.C, delete4.C, delete5.C: New tests.
-
-1999-11-19  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
-
-       * template7.C: Crash test passes, bug error is now bogus.
-
-1999-11-11  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
-
-       * template9.C: New test.
-
-1999-09-18  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
-
-       * overload1.C: New test.
-
-       * inline1.C: New test.
-
-1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * thunk1.C: New test.
-
-1999-08-06  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * dwarf2.C, dwarf3.C: Added XFAIL for Solaris/x86.  Removed
-       -gdwarf.
-       * dwarf1.C: Removed -gdwarf.
-
-1999-08-05  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * new1.C, template8.C: Removed XFAIL.
-       * template3.C: Re-introduced XFAIL.  :-(
-
-1999-08-03  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * ext1.C: New test.
-
-       * dwarf1.C, dwarf2.C, dwarf3.C: New tests.
-
-1999-07-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * template8.C, typeof1.C: New test.
-
-1999-07-17  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * template6.C, delete1.C, template7.C: New test.
-
-1999-07-13  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * template5.C: New test.
-
-       * template4.C: New test.
-
-       * expr1.C: New test.
-
-       * partspec1.C: New test.
-
-1999-07-05  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * typename1.C, typename2.C: New tests.
-
-       * template3.C: Fixed.
-
-       * ns3.C: New test.
-
-1999-07-03  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * ctor1.C: New test.
-
-       * template3.C: New test.
-
-1999-07-02  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * ns1.C: Typo.
-       * ns2.C: New test.
-
-       * template2.C: New test.
-
-       * ns1.C: New test.
-
-1999-07-01  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-       * new1.C: New test.
-
-       * partord1.C: New test.
-
-       * template1.C: New test.
-
-\f
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.

diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog-2005 b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog-2005
new file mode 100644 (file)
index 0000000..995ac91
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog-2005
@@ -0,0 +1,127 @@
+2005-04-03  Alexandre Oliva  <aoliva@redhat.com>
+
+       PR c++/19199
+       * expr2.C: Fixed.
+
+2003-06-04  J"orn Rennecke <joern.rennecke@superh.com>
+
+       * template1.C (bar): Remove xfail marker.
+
+2002-07-06  Alexandre Oliva  <aoliva@redhat.com>
+
+       * linkage1.C, linkage1-main.cc: New test.
+
+2001-02-15  Alexandre Oliva  <aoliva@redhat.com>
+
+       * friend1.C: New test.
+
+2000-05-28  Alexandre Oliva  <aoliva@cygnus.com>
+
+       * expr2.C: New test.
+
+2000-04-19  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * stkalign.C: New test.
+
+1999-12-22  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * nameret2.C: New test.
+
+       * nameret1.C: New test.
+
+       * template10.C: New test.
+
+1999-11-21  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * delete2.C, delete3.C, delete4.C, delete5.C: New tests.
+
+1999-11-19  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * template7.C: Crash test passes, bug error is now bogus.
+
+1999-11-11  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * template9.C: New test.
+
+1999-09-18  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * overload1.C: New test.
+
+       * inline1.C: New test.
+
+1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * thunk1.C: New test.
+
+1999-08-06  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * dwarf2.C, dwarf3.C: Added XFAIL for Solaris/x86.  Removed
+       -gdwarf.
+       * dwarf1.C: Removed -gdwarf.
+
+1999-08-05  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * new1.C, template8.C: Removed XFAIL.
+       * template3.C: Re-introduced XFAIL.  :-(
+
+1999-08-03  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * ext1.C: New test.
+
+       * dwarf1.C, dwarf2.C, dwarf3.C: New tests.
+
+1999-07-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * template8.C, typeof1.C: New test.
+
+1999-07-17  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * template6.C, delete1.C, template7.C: New test.
+
+1999-07-13  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * template5.C: New test.
+
+       * template4.C: New test.
+
+       * expr1.C: New test.
+
+       * partspec1.C: New test.
+
+1999-07-05  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * typename1.C, typename2.C: New tests.
+
+       * template3.C: Fixed.
+
+       * ns3.C: New test.
+
+1999-07-03  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * ctor1.C: New test.
+
+       * template3.C: New test.
+
+1999-07-02  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * ns1.C: Typo.
+       * ns2.C: New test.
+
+       * template2.C: New test.
+
+       * ns1.C: New test.
+
+1999-07-01  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * new1.C: New test.
+
+       * partord1.C: New test.
+
+       * template1.C: New test.
+
+\f
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.

diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/template1.C b/gcc/testsuite/g++.old-deja/g++.oliva/template1.C
index ce394961804d20f2ca994ae8c15e569c681ce138..908a06990a2179d59a4dc8f14006de0793ed0424 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.oliva/template1.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/template1.C
@@ -7,7 +7,7 @@
 
 
 template<int P = 0> struct foo {
-  static void bar(double (*)[dim]) {} // { dg-error "'dim' was not declared" } 
+  static void bar(double (*)[dim]) {} // { dg-error "'dim' was not declared|array bound" }
 };
 
 void bar() {

diff --git a/gcc/testsuite/g++.old-deja/g++.other/friend8.C b/gcc/testsuite/g++.old-deja/g++.other/friend8.C
index bbe4bf5987100c118300af350f7a0c4d17c9bc48..c1e93d94ab03fc7648b7a0e3d924ca5b77d50dff 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.other/friend8.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/friend8.C
@@ -1,3 +1,4 @@
+// { dg-options "-std=c++98 -pedantic-errors" }
 // { dg-do assemble  }
 // 
 // Copyright (C) 2000 Free Software Foundation, Inc.

diff --git a/gcc/testsuite/g++.old-deja/g++.other/init4.C b/gcc/testsuite/g++.old-deja/g++.other/init4.C
index f877f2a87d2069fdcabe9bcfa8153b5abb71a1ed..92562ef5845c22b4ff6d335bb65cdba4f19da81a 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.other/init4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/init4.C
@@ -1,3 +1,4 @@
+// { dg-options -std=c++98 }
 // { dg-do assemble  }
 
 class error {

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash32.C b/gcc/testsuite/g++.old-deja/g++.pt/crash32.C
index 64ed2290fbb9eb3fbb949a6d6b302e0b30b33ac0..0be26eab414ced67c89d11f9c8332a0e143f3663 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash32.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash32.C
@@ -1,3 +1,4 @@
+// { dg-options "-std=c++98 -pedantic-errors" }
 // { dg-do assemble  }
 // Origin: Jason Merrill <jason@cygnus.com>
 

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend38.C b/gcc/testsuite/g++.old-deja/g++.pt/friend38.C
index 429e421b8979637cb9a759424b2b58dfd4650c34..f2343d0d7d16458226c3f062b8913ceac162ed93 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.pt/friend38.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend38.C
@@ -1,3 +1,4 @@
+// { dg-options "-std=c++98 -pedantic-errors" }
 // { dg-do assemble  }
 
 // Overly simplified from testcase by "B. K. Oxley" <binkley@bigfoot.com>

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index 58b59a49dd63d33872ed07b3e6923c5ce96790d1..f5cbc4ca62ed50b94943fda0a992c10ce830a78f 100644 (file)
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -30,6 +30,9 @@ proc prune_gcc_output { text } {
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text
     regsub -all "(^|\n)\[0-9\]\[0-9\]* errors\." $text "" text
 
+    # Ignore informational notes.
+    regsub -all "(^|\n)\[^\n\]*: note: \[^\n\]*" $text "" text
+
     # Ignore harmless -fpic warnings.
     regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target\[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC)( and -fpic are| is)? not supported\[^\n\]*" $text "" text