From 377a5364302b126840da543d6acf46b68e59a486 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 9 Jun 2011 23:56:00 -0400 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 41 +++++++++++++++++++ .../testsuite/20_util/duration/cons/1_neg.cc | 1 - .../duration/requirements/typedefs_neg2.cc | 5 +-- .../testsuite/20_util/forward/1_neg.cc | 1 - .../testsuite/20_util/function/cmp/cmp_neg.cc | 1 - .../ratio/operations/ops_overflow_neg.cc | 4 +- .../20_util/reference_wrapper/ref_neg.cc | 4 +- .../20_util/shared_ptr/assign/auto_ptr_neg.cc | 3 +- .../assign/unique_ptr_lvalue_neg.cc | 2 +- .../20_util/shared_ptr/cons/auto_ptr_neg.cc | 1 - .../20_util/shared_ptr/cons/unique_ptr_neg.cc | 2 +- .../tuple/comparison_operators/35480_neg.cc | 2 +- .../20_util/unique_ptr/cons/auto_ptr_neg.cc | 1 - .../unique_ptr/cons/ptr_deleter_neg.cc | 2 +- .../20_util/uses_allocator/cons_neg.cc | 1 - .../deque/requirements/dr438/assign_neg.cc | 1 - .../requirements/dr438/constructor_1_neg.cc | 1 - .../requirements/dr438/constructor_2_neg.cc | 1 - .../deque/requirements/dr438/insert_neg.cc | 1 - .../requirements/dr438/assign_neg.cc | 1 - .../requirements/dr438/constructor_1_neg.cc | 1 - .../requirements/dr438/constructor_2_neg.cc | 1 - .../requirements/dr438/insert_neg.cc | 1 - .../list/requirements/dr438/assign_neg.cc | 1 - .../requirements/dr438/constructor_1_neg.cc | 1 - .../requirements/dr438/constructor_2_neg.cc | 1 - .../list/requirements/dr438/insert_neg.cc | 1 - .../23_containers/map/operators/1_neg.cc | 1 - .../23_containers/set/operators/1_neg.cc | 1 - .../vector/requirements/dr438/assign_neg.cc | 1 - .../requirements/dr438/constructor_1_neg.cc | 1 - .../requirements/dr438/constructor_2_neg.cc | 1 - .../vector/requirements/dr438/insert_neg.cc | 1 - .../atomic_integral/operators/bitwise_neg.cc | 5 ++- .../testsuite/decimal/mixed-mode-arith_neg.cc | 1 - .../testsuite/decimal/mixed-mode-cmp_neg.cc | 1 - .../testsuite/decimal/operator_neg.cc | 1 - libstdc++-v3/testsuite/lib/prune.exp | 3 ++ .../shared_ptr/assign/auto_ptr_neg.cc | 3 +- .../shared_ptr/assign/auto_ptr_rvalue_neg.cc | 1 - .../shared_ptr/cons/auto_ptr_neg.cc | 1 - .../tuple/comparison_operators/35480_neg.cc | 2 +- 42 files changed, 63 insertions(+), 44 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fb68e07371b..c8d33b1658c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,44 @@ +2011-06-09 Jason Merrill + + * 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 * 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 56b4e4f413e..eddd57ce035 100644 --- 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 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 c30d94c2e0a..a3ab76972b3 100644 --- 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 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 978ea52c7f8..7f16bf3555b 100644 --- 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 sp1 = factory(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 28c0e12d164..d5e268e88fd 100644 --- 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 07b1a567b01..0e36c741846 100644 --- 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 947a9b02f1e..c3b37f71ab9 100644 --- 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 b79a25b131c..754b616b76f 100644 --- 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 dae967bfd5d..91af6c06f99 100644 --- 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 b078a7df798..256f2c9826e 100644 --- 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; std::shared_ptr 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 0e2fd68d570..fc12787de71 100644 --- 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 613c27f8b31..eb22938261a 100644 --- 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 76910c3c64a..32d52ca49ea 100644 --- 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(new A); std::unique_ptr 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 e765874c725..312ecbe338e 100644 --- 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 b6b706c67eb..73a0d0f7029 100644 --- 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 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 1b0ececc05f..60f5008d690 100644 --- 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 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 ebb9c3be348..2d84537e30a 100644 --- 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 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 943bc637b1e..2329a32a4d2 100644 --- 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 #include 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 396122f5a89..631d76c4aa6 100644 --- 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 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 35ce47edf35..a2be5cfc0dc 100644 --- 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 9c89fe793cf..dca3459d4c1 100644 --- 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 cb22c379a76..ec9e9c18eb0 100644 --- 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 684b5013a91..59e74eb3921 100644 --- 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 54473ee4231..600389ec8d0 100644 --- 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 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 5f7b07f51dc..96b98591add 100644 --- 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 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 1bf19de6e1a..33bd0e93651 100644 --- 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 #include 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 05dd2e732cc..4f88cd4bb69 100644 --- 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 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 c5fd9cd0db6..09120528ccc 100644 --- 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 babd6db2b2b..483054f3fef 100644 --- 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 fcead6a4e9b..eba024c0c8c 100644 --- 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 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 acb195392bd..24c14ce6bba 100644 --- 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 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 dd519da8ff3..b765096d9d4 100644 --- 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 #include 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 5fb20456240..083f2e0d26c 100644 --- 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 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 4ee4e7fd6fa..5fb4984bf0b 100644 --- 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 5cc67fbec7f..afdc0382cd1 100644 --- 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 46a38acd3ed..5ff9a71a7ea 100644 --- 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 fff81d1c06f..d1db024d96a 100644 --- 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 e7d6a5acb8b..a5644061d23 100644 --- 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 eb067a97b3f..1950459a912 100644 --- 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 f4d960da845..73ffdcbc109 100644 --- 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 1d7b921a891..0990e5e3cc0 100644 --- 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 aff8e9a40b6..9c693d4182f 100644 --- 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" } -- 2.30.2