Commit 377a5364 by Jason Merrill Committed by Jason Merrill

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
parent b82972ca
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> 2011-06-09 Simon Baldwin <simonb@google.com>
* scripts/extract_symvers.in: Handle processor/OS specific or * scripts/extract_symvers.in: Handle processor/OS specific or
......
...@@ -38,4 +38,3 @@ test02() ...@@ -38,4 +38,3 @@ test02()
duration<int, std::milli> d2_copy(d2); // { dg-error "no matching" } duration<int, std::milli> d2_copy(d2); // { dg-error "no matching" }
} }
// { dg-excess-errors "candidates are" }
...@@ -29,9 +29,8 @@ void test01() ...@@ -29,9 +29,8 @@ void test01()
typedef int rep_type; typedef int rep_type;
typedef int period_type; typedef int period_type;
typedef std::chrono::duration<rep_type, period_type> test_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 "must be a specialization of ratio" "" { target *-*-* } 227 }
// { dg-error "required from here" "" { target *-*-* } 32 } // { dg-prune-output "not a member" }
// { dg-excess-errors "In instantiation of" }
...@@ -41,4 +41,3 @@ void g() ...@@ -41,4 +41,3 @@ void g()
std::shared_ptr<A> sp1 = factory<A>(2, 1.414); // { dg-error "required from here" } std::shared_ptr<A> sp1 = factory<A>(2, 1.414); // { dg-error "required from here" }
} }
// { dg-excess-errors "" }
...@@ -29,4 +29,3 @@ void test01() ...@@ -29,4 +29,3 @@ void test01()
f1 == f2; // { dg-error "no match" } f1 == f2; // { dg-error "no match" }
f1 != f2; // { dg-error "no match" } f1 != f2; // { dg-error "no match" }
} }
// { dg-excess-errors "candidates are" }
...@@ -43,5 +43,5 @@ test02() ...@@ -43,5 +43,5 @@ test02()
// { dg-error "overflow in multiplication" "" { target *-*-* } 104 } // { dg-error "overflow in multiplication" "" { target *-*-* } 104 }
// { dg-error "overflow in multiplication" "" { target *-*-* } 100 } // { dg-error "overflow in multiplication" "" { target *-*-* } 100 }
// { dg-error "overflow in multiplication" "" { target *-*-* } 102 } // { dg-error "overflow in multiplication" "" { target *-*-* } 102 }
// { dg-excess-errors "In instantiation of" } // { dg-prune-output "out of range" }
// { dg-excess-errors "out of range" } // { dg-prune-output "not usable in a constant expression" }
...@@ -38,7 +38,7 @@ void test01() ...@@ -38,7 +38,7 @@ void test01()
int main() int main()
{ {
test02(); test01();
} }
// { dg-excess-errors "" } // { dg-prune-output "declared here" }
...@@ -47,4 +47,5 @@ main() ...@@ -47,4 +47,5 @@ main()
test01(); test01();
return 0; return 0;
} }
// { dg-excess-errors "In constructor" }
// { dg-prune-output "cannot convert" }
...@@ -46,4 +46,4 @@ main() ...@@ -46,4 +46,4 @@ main()
test01(); test01();
return 0; return 0;
} }
// { dg-excess-errors "initializing argument" } // { dg-prune-output "initializing argument" }
...@@ -33,4 +33,3 @@ test01() ...@@ -33,4 +33,3 @@ test01()
const std::auto_ptr<A> a; const std::auto_ptr<A> a;
std::shared_ptr<A> p(std::move(a)); // { dg-error "no match" } std::shared_ptr<A> p(std::move(a)); // { dg-error "no match" }
} }
// { dg-excess-errors "candidates are" }
...@@ -45,4 +45,4 @@ main() ...@@ -45,4 +45,4 @@ main()
test01(); test01();
return 0; return 0;
} }
// { dg-excess-errors "initializing argument" } // { dg-prune-output "initializing argument" }
...@@ -30,4 +30,4 @@ void test01() ...@@ -30,4 +30,4 @@ void test01()
if ( t1 < t2 ) {} // { dg-error "here" } if ( t1 < t2 ) {} // { dg-error "here" }
if ( t1 == t2 ) {} // { dg-error "here" } if ( t1 == t2 ) {} // { dg-error "here" }
} }
// { dg-excess-errors "incomplete type" } // { dg-prune-output "incomplete type" }
...@@ -33,4 +33,3 @@ test01() ...@@ -33,4 +33,3 @@ test01()
const std::auto_ptr<A> a(new A); const std::auto_ptr<A> a(new A);
std::unique_ptr<A> a2(std::move(a)); // { dg-error "no match" } std::unique_ptr<A> a2(std::move(a)); // { dg-error "no match" }
} }
// { dg-excess-errors "candidates are" }
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
using std::unique_ptr; using std::unique_ptr;
// { dg-excess-errors "static assertion failed" } // { dg-prune-output "static assertion failed" }
void void
test01() test01()
......
...@@ -45,4 +45,3 @@ void test01() ...@@ -45,4 +45,3 @@ void test01()
tuple<Type> t(allocator_arg, a, 1); tuple<Type> t(allocator_arg, a, 1);
} }
// { dg-error "no matching function" "" { target *-*-* } 112 } // { dg-error "no matching function" "" { target *-*-* } 112 }
// { dg-excess-errors "note" }
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1668 } // { dg-error "no matching" "" { target *-*-* } 1668 }
// { dg-excess-errors "" }
#include <deque> #include <deque>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1601 } // { dg-error "no matching" "" { target *-*-* } 1601 }
// { dg-excess-errors "" }
#include <deque> #include <deque>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1601 } // { dg-error "no matching" "" { target *-*-* } 1601 }
// { dg-excess-errors "" }
#include <deque> #include <deque>
#include <utility> #include <utility>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1752 } // { dg-error "no matching" "" { target *-*-* } 1752 }
// { dg-excess-errors "" }
#include <deque> #include <deque>
......
// { dg-do compile } // { dg-do compile }
// { dg-options "-std=gnu++0x" } // { dg-options "-std=gnu++0x" }
// { dg-error "no matching" "" { target *-*-* } 1210 } // { dg-error "no matching" "" { target *-*-* } 1210 }
// { dg-excess-errors "" }
// Copyright (C) 2009, 2010 Free Software Foundation // Copyright (C) 2009, 2010 Free Software Foundation
// //
......
// { dg-do compile } // { dg-do compile }
// { dg-options "-std=gnu++0x" } // { dg-options "-std=gnu++0x" }
// { dg-error "no matching" "" { target *-*-* } 1210 } // { dg-error "no matching" "" { target *-*-* } 1210 }
// { dg-excess-errors "" }
// Copyright (C) 2009, 2010, 2011 Free Software Foundation // Copyright (C) 2009, 2010, 2011 Free Software Foundation
// //
......
// { dg-do compile } // { dg-do compile }
// { dg-options "-std=gnu++0x" } // { dg-options "-std=gnu++0x" }
// { dg-error "no matching" "" { target *-*-* } 1210 } // { dg-error "no matching" "" { target *-*-* } 1210 }
// { dg-excess-errors "" }
// Copyright (C) 2009, 2010, 2011 Free Software Foundation // Copyright (C) 2009, 2010, 2011 Free Software Foundation
// //
......
// { dg-do compile } // { dg-do compile }
// { dg-options "-std=gnu++0x" } // { dg-options "-std=gnu++0x" }
// { dg-error "no matching" "" { target *-*-* } 1210 } // { dg-error "no matching" "" { target *-*-* } 1210 }
// { dg-excess-errors "" }
// Copyright (C) 2009, 2010, 2011 Free Software Foundation // Copyright (C) 2009, 2010, 2011 Free Software Foundation
// //
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1497 } // { dg-error "no matching" "" { target *-*-* } 1497 }
// { dg-excess-errors "" }
#include <list> #include <list>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1453 } // { dg-error "no matching" "" { target *-*-* } 1453 }
// { dg-excess-errors "" }
#include <list> #include <list>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1453 } // { dg-error "no matching" "" { target *-*-* } 1453 }
// { dg-excess-errors "" }
#include <list> #include <list>
#include <utility> #include <utility>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1453 } // { dg-error "no matching" "" { target *-*-* } 1453 }
// { dg-excess-errors "" }
#include <list> #include <list>
......
...@@ -42,4 +42,3 @@ void test01() ...@@ -42,4 +42,3 @@ void test01()
test &= itr == mapByName.end(); // { dg-error "no" } test &= itr == mapByName.end(); // { dg-error "no" }
} }
// { dg-excess-errors "" }
...@@ -40,4 +40,3 @@ void test01() ...@@ -40,4 +40,3 @@ void test01()
test &= itr == setByName.end(); // { dg-error "no" } test &= itr == setByName.end(); // { dg-error "no" }
} }
// { dg-excess-errors "" }
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1157 } // { dg-error "no matching" "" { target *-*-* } 1157 }
// { dg-excess-errors "" }
#include <vector> #include <vector>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1087 } // { dg-error "no matching" "" { target *-*-* } 1087 }
// { dg-excess-errors "" }
#include <vector> #include <vector>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1087 } // { dg-error "no matching" "" { target *-*-* } 1087 }
// { dg-excess-errors "" }
#include <vector> #include <vector>
#include <utility> #include <utility>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// { dg-do compile } // { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1198 } // { dg-error "no matching" "" { target *-*-* } 1198 }
// { dg-excess-errors "" }
#include <vector> #include <vector>
......
...@@ -27,7 +27,10 @@ int main() ...@@ -27,7 +27,10 @@ int main()
return 0; return 0;
} }
// { dg-error "deleted" "" { target *-*-* } 426 }
// { dg-error "deleted" "" { target *-*-* } 427 }
// { dg-error "operator" "" { target *-*-* } 428 } // { dg-error "operator" "" { target *-*-* } 428 }
// { dg-error "operator" "" { target *-*-* } 429 } // { dg-error "operator" "" { target *-*-* } 429 }
// { dg-error "operator" "" { target *-*-* } 430 } // { dg-error "operator" "" { target *-*-* } 430 }
// { dg-excess-errors "In file included from" }
// { dg-prune-output "declared here" }
...@@ -137,4 +137,3 @@ bad_divideeq (void) ...@@ -137,4 +137,3 @@ bad_divideeq (void)
a128 /= ld; // { dg-error "error" } a128 /= ld; // { dg-error "error" }
} }
// { dg-excess-errors "notes about candidates" }
...@@ -103,4 +103,3 @@ bad_ge (void) ...@@ -103,4 +103,3 @@ bad_ge (void)
b6 = d >= b128; // { dg-error "error" } b6 = d >= b128; // { dg-error "error" }
} }
// { dg-excess-errors "notes about candidates" }
...@@ -157,4 +157,3 @@ logical_not (void) ...@@ -157,4 +157,3 @@ logical_not (void)
a128 = !b128; // { dg-error "error" } a128 = !b128; // { dg-error "error" }
} }
// { dg-excess-errors "" { target *-*-* } }
...@@ -46,6 +46,9 @@ proc libstdc++-dg-prune { system text } { ...@@ -46,6 +46,9 @@ proc libstdc++-dg-prune { system text } {
regsub -all "(^|\n)In file included from \[^\n\]*" $text "" text regsub -all "(^|\n)In file included from \[^\n\]*" $text "" text
regsub -all "(^|\n)\[ \t\]*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. # 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\]*: Additional NOP may be necessary to workaround Itanium processor A/B step errata" $text "" text
regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text
......
...@@ -46,4 +46,5 @@ main() ...@@ -46,4 +46,5 @@ main()
test01(); test01();
return 0; return 0;
} }
// { dg-excess-errors "In constructor" }
// { dg-prune-output "cannot convert" }
...@@ -45,4 +45,3 @@ main() ...@@ -45,4 +45,3 @@ main()
test01(); test01();
return 0; return 0;
} }
// { dg-excess-errors "candidates are" }
...@@ -44,4 +44,3 @@ main() ...@@ -44,4 +44,3 @@ main()
test01(); test01();
return 0; return 0;
} }
// { dg-excess-errors "candidates are" }
...@@ -29,4 +29,4 @@ void test01() ...@@ -29,4 +29,4 @@ void test01()
if ( t1 < t2 ) {} // { dg-error "here" } if ( t1 < t2 ) {} // { dg-error "here" }
if ( t1 == t2 ) {} // { dg-error "here" } if ( t1 == t2 ) {} // { dg-error "here" }
} }
// { dg-excess-errors "incomplete type" } // { dg-prune-output "incomplete type" }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment