prune.exp (libstdc++-dg-prune): Prune notes.

	* testsuite/lib/prune.exp (libstdc++-dg-prune): Prune notes.
	* testsuite/20_util/duration/cons/1_neg.cc: Remove dg-excess-errors.
	* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Likewise.
	* testsuite/20_util/forward/1_neg.cc: Likewise.
	* testsuite/20_util/function/cmp/cmp_neg.cc: Likewise.
	* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Likewise.
	* testsuite/20_util/reference_wrapper/ref_neg.cc: Likewise.
	* testsuite/20_util/tuple/comparison_operators/35480_neg.cc: Likewise.
	* testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc: Likewise.
	* testsuite/20_util/unique_ptr/cons/auto_ptr_neg.cc: Likewise.
	* testsuite/20_util/unique_ptr/cons/ptr_deleter_neg.cc: Likewise.
	* testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_neg.cc: Likewise.
	* testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc: Likewise.
	* testsuite/tr1/2_general_utilities/shared_ptr/cons/auto_ptr_neg.cc: Likewise.
	* testsuite/20_util/uses_allocator/cons_neg.cc: Likewise.
	* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Likewise.
	* testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc: Likewise.
	* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Likewise.
	* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc: Likewise.
	* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Likewise.
	* testsuite/23_containers/map/operators/1_neg.cc: Likewise.
	* testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc: Likewise.
	* testsuite/decimal/mixed-mode-arith_neg.cc: Likewise.
	* testsuite/decimal/mixed-mode-cmp_neg.cc: Likewise.
	* testsuite/decimal/operator_neg.cc: Likewise.

From-SVN: r174884

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fb68e07371b3e85ec874ade8af0be897b2db6fa0..c8d33b1658c2b8f0e69375e9dce60abd18b0fd2a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,44 @@
+2011-06-09  Jason Merrill  <jason@redhat.com>
+
+       * testsuite/lib/prune.exp (libstdc++-dg-prune): Prune notes.
+       * testsuite/20_util/duration/cons/1_neg.cc: Remove dg-excess-errors.
+       * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Likewise.
+       * testsuite/20_util/forward/1_neg.cc: Likewise.
+       * testsuite/20_util/function/cmp/cmp_neg.cc: Likewise.
+       * testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Likewise.
+       * testsuite/20_util/reference_wrapper/ref_neg.cc: Likewise.
+       * testsuite/20_util/tuple/comparison_operators/35480_neg.cc: Likewise.
+       * testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc: Likewise.
+       * testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc: Likewise.
+       * testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc: Likewise.
+       * testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc: Likewise.
+       * testsuite/20_util/unique_ptr/cons/auto_ptr_neg.cc: Likewise.
+       * testsuite/20_util/unique_ptr/cons/ptr_deleter_neg.cc: Likewise.
+       * testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_neg.cc: Likewise.
+       * testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc: Likewise.
+       * testsuite/tr1/2_general_utilities/shared_ptr/cons/auto_ptr_neg.cc: Likewise.
+       * testsuite/20_util/uses_allocator/cons_neg.cc: Likewise.
+       * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Likewise.
+       * testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc: Likewise.
+       * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Likewise.
+       * testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc: Likewise.
+       * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Likewise.
+       * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Likewise.
+       * testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc: Likewise.
+       * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Likewise.
+       * testsuite/23_containers/map/operators/1_neg.cc: Likewise.
+       * testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc: Likewise.
+       * testsuite/decimal/mixed-mode-arith_neg.cc: Likewise.
+       * testsuite/decimal/mixed-mode-cmp_neg.cc: Likewise.
+       * testsuite/decimal/operator_neg.cc: Likewise.
+
 2011-06-09  Simon Baldwin  <simonb@google.com>
 
        * scripts/extract_symvers.in: Handle processor/OS specific or

diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc
index 56b4e4f413e5894df217964d9af1851fd96efa81..eddd57ce035546b0d2b4c4cd86221e0be326c9d0 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc
@@ -38,4 +38,3 @@ test02()
   duration<int, std::milli> d2_copy(d2); // { dg-error "no matching" }
 }
 
-// { dg-excess-errors "candidates are" }

diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc
index c30d94c2e0a5f765c3410fbf99a4b69826c0c995..a3ab76972b317c0ec278398bc997f9a6450f0fcf 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc
@@ -29,9 +29,8 @@ void test01()
   typedef int rep_type;
   typedef int period_type;
   typedef std::chrono::duration<rep_type, period_type> test_type;
-  test_type d;
+  test_type d;                 // { dg-error "required from here" }
 }
 
 // { dg-error "must be a specialization of ratio" "" { target *-*-* } 227 }
-// { dg-error "required from here" "" { target *-*-* } 32 }
-// { dg-excess-errors "In instantiation of" }
+// { dg-prune-output "not a member" }

diff --git a/libstdc++-v3/testsuite/20_util/forward/1_neg.cc b/libstdc++-v3/testsuite/20_util/forward/1_neg.cc
index 978ea52c7f86b831367cae42080c3dc28f75d31f..7f16bf3555be5a263352ab55f97a7b520e76b512 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/forward/1_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/forward/1_neg.cc
@@ -41,4 +41,3 @@ void g()
   std::shared_ptr<A> sp1 = factory<A>(2, 1.414); // { dg-error "required from here" }
 }
 
-// { dg-excess-errors "" }

diff --git a/libstdc++-v3/testsuite/20_util/function/cmp/cmp_neg.cc b/libstdc++-v3/testsuite/20_util/function/cmp/cmp_neg.cc
index 28c0e12d1649076fdc500404b68d94722831ee55..d5e268e88fdaa5c42f4b30b7c1e813b6ef571eb0 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/function/cmp/cmp_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/function/cmp/cmp_neg.cc
@@ -29,4 +29,3 @@ void test01()
   f1 == f2;  // { dg-error "no match" }
   f1 != f2;  // { dg-error "no match" }
 }
-// { dg-excess-errors "candidates are" }

diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc
index 07b1a567b01bc3411c432393c9b9242b05b87f5e..0e36c741846c1462cd3d4c99d781ea4f32871a9d 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc
@@ -43,5 +43,5 @@ test02()
 // { dg-error "overflow in multiplication" "" { target *-*-* } 104 }
 // { dg-error "overflow in multiplication" "" { target *-*-* } 100 }
 // { dg-error "overflow in multiplication" "" { target *-*-* } 102 }
-// { dg-excess-errors "In instantiation of" }
-// { dg-excess-errors "out of range" }
+// { dg-prune-output "out of range" }
+// { dg-prune-output "not usable in a constant expression" }

diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/ref_neg.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/ref_neg.cc
index 947a9b02f1e986d597a15f0c974df5a0030ce78b..c3b37f71ab96f29047b0c94062eb20e70ecec31f 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/reference_wrapper/ref_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/ref_neg.cc
@@ -38,7 +38,7 @@ void test01()
 
 int main()
 {
-  test02();
+  test01();
 }
 
-// { dg-excess-errors "" }
+// { dg-prune-output "declared here" }

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc
index b79a25b131c4b8ea64d25cb35d40d2a72a11d0e7..754b616b76f7a327560618aff719587185faec4d 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc
@@ -47,4 +47,5 @@ main()
   test01();
   return 0;
 }
-// { dg-excess-errors "In constructor" }
+
+// { dg-prune-output "cannot convert" }

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc
index dae967bfd5deb5b9e0208750e76ae703dae97f8f..91af6c06f99cbb7acfc0e62102cd2b289182569f 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc
@@ -46,4 +46,4 @@ main()
   test01();
   return 0;
 }
-// { dg-excess-errors "initializing argument" }
+// { dg-prune-output "initializing argument" }

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr_neg.cc
index b078a7df7988843e8458ed2b40f5ab39a8ecc8d6..256f2c9826e55c2fb5d81e18dca5638d99e653f2 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr_neg.cc
@@ -33,4 +33,3 @@ test01()
   const std::auto_ptr<A> a;
   std::shared_ptr<A> p(std::move(a)); // { dg-error "no match" }
 }
-// { dg-excess-errors "candidates are" }

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc
index 0e2fd68d570484f685ad676e9c7d59511e3d66b0..fc12787de711c2a43cd127afd1aa1363e444faf6 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc
@@ -45,4 +45,4 @@ main()
   test01();
   return 0;
 }
-// { dg-excess-errors "initializing argument" }
+// { dg-prune-output "initializing argument" }

diff --git a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc
index 613c27f8b3121b0d8cd6c7bea4442cccad9075f7..eb22938261a8a85e8f71dfbb2715f6d00350b0ef 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc
@@ -30,4 +30,4 @@ void test01()
   if ( t1 < t2 ) {}   // { dg-error "here" }
   if ( t1 == t2 ) {}  // { dg-error "here" }
 }
-// { dg-excess-errors "incomplete type" }
+// { dg-prune-output "incomplete type" }

diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr_neg.cc
index 76910c3c64a9700ade2ca2ffde5b4c743e297d9f..32d52ca49eaa6c9df7c30e585d035148e7232923 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr_neg.cc
@@ -33,4 +33,3 @@ test01()
   const std::auto_ptr<A> a(new A);
   std::unique_ptr<A> a2(std::move(a)); // { dg-error "no match" }
 }
-// { dg-excess-errors "candidates are" }

diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter_neg.cc
index e765874c72550d457c3c6baff29c68257d8ba8cf..312ecbe338e0b7e9d54dadd7debe1bf83f61b980 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter_neg.cc
@@ -25,7 +25,7 @@
 
 using std::unique_ptr;
 
-// { dg-excess-errors "static assertion failed" }
+// { dg-prune-output "static assertion failed" }
 
 void
 test01()

diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc
index b6b706c67eba2ad2ab6d284730caf8b0ff6995d7..73a0d0f702974a33e769b48839bf1f74015a75a3 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc
@@ -45,4 +45,3 @@ void test01()
   tuple<Type> t(allocator_arg, a, 1);
 }
 // { dg-error "no matching function" "" { target *-*-* } 112 }
-// { dg-excess-errors "note" }

diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc
index 1b0ececc05f641b78baeb90ead07d4bdbf2ba7b2..60f5008d6903cdd3ae0be365d05e83d0dcc385b2 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1668 }
-// { dg-excess-errors "" }
 
 #include <deque>
 

diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc
index ebb9c3be348ba68435c5f37789dacd8a7edb815e..2d84537e30a955c7cf9715b65d165b3e00e892e7 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1601 }
-// { dg-excess-errors "" }
 
 #include <deque>
 

diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc
index 943bc637b1e204eb7cb75a1e4b9a5d73ad0fcdf3..2329a32a4d251e088ea69a880418bf1cc80d15b2 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1601 }
-// { dg-excess-errors "" }
 
 #include <deque>
 #include <utility>

diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc
index 396122f5a89bb6afcfaa13100918961dbd45c632..631d76c4aa63493a17fe4e4514cd5c301fee6e62 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1752 }
-// { dg-excess-errors "" }
 
 #include <deque>
 

diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc
index 35ce47edf35472cf2dae12c6ece34d09212df35c..a2be5cfc0dcd7d71d24e189f6e1e3bc7827e72a2 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc
@@ -1,7 +1,6 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
 // { dg-error "no matching" "" { target *-*-* } 1210 }
-// { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010 Free Software Foundation
 //

diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc
index 9c89fe793cf4cea5f035fb000cc9b2a668f338af..dca3459d4c134fdb69e15fb3f8cd019eceac5376 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc
@@ -1,7 +1,6 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
 // { dg-error "no matching" "" { target *-*-* } 1210 }
-// { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010, 2011 Free Software Foundation
 //

diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc
index cb22c379a768a1a48423b488e3b86c5164595f75..ec9e9c18eb0e057fd0001a7383f1e66188075e63 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc
@@ -1,7 +1,6 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
 // { dg-error "no matching" "" { target *-*-* } 1210 }
-// { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010, 2011 Free Software Foundation
 //

diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc
index 684b5013a91cb704750a26a20b2b7da26b2c946e..59e74eb392186b75943058e37a572f115ef5371d 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc
@@ -1,7 +1,6 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
 // { dg-error "no matching" "" { target *-*-* } 1210 }
-// { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010, 2011 Free Software Foundation
 //

diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc
index 54473ee4231578c2fd6c3cda6acacf6761fea503..600389ec8d062f622d34ff89eb96e3636de47955 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1497 }
-// { dg-excess-errors "" }
 
 #include <list>
 

diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc
index 5f7b07f51dc339bea67857ce5f811451caa7f832..96b98591add66694e7aa50facdc478d729551a3b 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1453 }
-// { dg-excess-errors "" }
 
 #include <list>
 

diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
index 1bf19de6e1aa80d4a90000964836df07aa2924b0..33bd0e936512e2ea0ccfe5c908d2d30f85134fa5 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1453 }
-// { dg-excess-errors "" }
 
 #include <list>
 #include <utility>

diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc
index 05dd2e732cc271b954a5f69eacf1868c76b819e9..4f88cd4bb6998cc1293484874f7f4e043fa5a094 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1453 }
-// { dg-excess-errors "" }
 
 #include <list>
 

diff --git a/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc
index c5fd9cd0db6e4ab228f3c13f7691b3b92e17c7ba..09120528cccede6fd90d2bf13e186542e87ece9f 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc
@@ -42,4 +42,3 @@ void test01()
   test &= itr == mapByName.end(); // { dg-error "no" } 
 }
 
-// { dg-excess-errors "" }

diff --git a/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc
index babd6db2b2baa8ff303557540882441ac838122e..483054f3fef04d904b1719b12316567e028e6f20 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc
@@ -40,4 +40,3 @@ void test01()
   test &= itr == setByName.end(); // { dg-error "no" } 
 }
 
-// { dg-excess-errors "" }

diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
index fcead6a4e9b3da1ccf1b215d8109c78e33d328db..eba024c0c8ca0291a7b62a3c5f0251bb1fd54e76 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1157 }
-// { dg-excess-errors "" }
 
 #include <vector>
 

diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
index acb195392bde7e4e2abaff61d11dfa5d15972e00..24c14ce6bba58737b31ce0eb32ac144ecbc069fd 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1087 }
-// { dg-excess-errors "" }
 
 #include <vector>
 

diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
index dd519da8ff39dcc75b06ece246935e5dd854b19b..b765096d9d482e63b6d7c8772e4be7c353c21402 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1087 }
-// { dg-excess-errors "" }
 
 #include <vector>
 #include <utility>

diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
index 5fb204562408c85ed49be0060187de01b69f7859..083f2e0d26c7138ce812a51a68824d54d49f7ae1 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
@@ -19,7 +19,6 @@
 
 // { dg-do compile }
 // { dg-error "no matching" "" { target *-*-* } 1198 }
-// { dg-excess-errors "" }
 
 #include <vector>
 

diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
index 4ee4e7fd6fac9ce7083f0f173e429293b7398ed0..5fb4984bf0bdbdcf792012698cb4602e637832e9 100644 (file)
--- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
@@ -27,7 +27,10 @@ int main()
   return 0;
 }
 
+// { dg-error "deleted" "" { target *-*-* } 426 }
+// { dg-error "deleted" "" { target *-*-* } 427 }
 // { dg-error "operator" "" { target *-*-* } 428 }
 // { dg-error "operator" "" { target *-*-* } 429 }
 // { dg-error "operator" "" { target *-*-* } 430 }
-// { dg-excess-errors "In file included from" }
+
+// { dg-prune-output "declared here" }

diff --git a/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc b/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
index 5cc67fbec7f1eab5449b2600bfcb61e4de9deda4..afdc0382cd1928160bcc6c6895f382a6e5cd0df1 100644 (file)
--- a/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
+++ b/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
@@ -137,4 +137,3 @@ bad_divideeq (void)
   a128 /= ld;          // { dg-error "error" }
 }
 
-// { dg-excess-errors "notes about candidates" }

diff --git a/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc b/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc
index 46a38acd3ed870af05ba620d34ba0f914d678822..5ff9a71a7ea78b18e8d4e12d66f1f57ed6f5ef41 100644 (file)
--- a/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc
+++ b/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc
@@ -103,4 +103,3 @@ bad_ge (void)
   b6 = d >= b128;      // { dg-error "error" }
 }
 
-// { dg-excess-errors "notes about candidates" }

diff --git a/libstdc++-v3/testsuite/decimal/operator_neg.cc b/libstdc++-v3/testsuite/decimal/operator_neg.cc
index fff81d1c06f5e8e73e8b1f9fd24eb9ab826c97e2..d1db024d96a247246a7cba4dfafcc2b80268bb8c 100644 (file)
--- a/libstdc++-v3/testsuite/decimal/operator_neg.cc
+++ b/libstdc++-v3/testsuite/decimal/operator_neg.cc
@@ -157,4 +157,3 @@ logical_not (void)
   a128 = !b128;                // { dg-error "error" } 
 }
 
-// { dg-excess-errors "" { target *-*-* } }

diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp
index e7d6a5acb8b55d024e866b478da025684c6d2742..a5644061d2367c9997beaf0f89510270e8ebacf9 100644 (file)
--- a/libstdc++-v3/testsuite/lib/prune.exp
+++ b/libstdc++-v3/testsuite/lib/prune.exp
@@ -46,6 +46,9 @@ proc libstdc++-dg-prune { system text } {
     regsub -all "(^|\n)In file included from \[^\n\]*" $text "" text
     regsub -all "(^|\n)\[ \t\]*from \[^\n\]*" $text "" text
 
+    # Ignore informational notes.
+    regsub -all "(^|\n)\[^\n\]*: note: \[^\n\]*" $text "" text
+
     # Ignore errata warning from IA64 assembler.
     regsub -all "(^|\n)\[^\n\]*: Additional NOP may be necessary to workaround Itanium processor A/B step errata" $text "" text
     regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text

diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_neg.cc
index eb067a97b3fce8ba6e623de897873918d5fb0d0a..1950459a912530649000221331be2149a25d7e86 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_neg.cc
@@ -46,4 +46,5 @@ main()
   test01();
   return 0;
 }
-// { dg-excess-errors "In constructor" }
+
+// { dg-prune-output "cannot convert" }

diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc
index f4d960da84597a70df48526748091842d84a8669..73ffdcbc109d936cf960a5e4fa84b7770897309f 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc
@@ -45,4 +45,3 @@ main()
   test01();
   return 0;
 }
-// { dg-excess-errors "candidates are" }

diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/auto_ptr_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/auto_ptr_neg.cc
index 1d7b921a89137550e1f061ac48384099fa9f51bb..0990e5e3cc03dc5250771098ed69b207b983fcc7 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/auto_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/auto_ptr_neg.cc
@@ -44,4 +44,3 @@ main()
   test01();
   return 0;
 }
-// { dg-excess-errors "candidates are" }

diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc
index aff8e9a40b619ddc68664f0bf4c2f4cd215e68f1..9c693d4182f99cb9812db76f499d06074c110b76 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc
@@ -29,4 +29,4 @@ void test01()
   if ( t1 < t2 ) {}   // { dg-error "here" }
   if ( t1 == t2 ) {}  // { dg-error "here" }
 }
-// { dg-excess-errors "incomplete type" }
+// { dg-prune-output "incomplete type" }