2011-06-10 Jason Merrill <jason@redhat.com>

	* testsuite/20_util/bind/ref_neg.cc: Remove dg-excess-errors,
	fix dg-error markup.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174906 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 55 insertions, 31 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1ad5db4e31e..2b577a7d580 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-10  Jason Merrill  <jason@redhat.com>
+
+	* testsuite/20_util/bind/ref_neg.cc: Remove dg-excess-errors,
+	fix dg-error markup.
+
 2011-06-09  Jason Merrill  <jason@redhat.com>
 
 	* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Adjust.
@@ -10,33 +15,54 @@
 	* 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/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/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/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/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/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.
@@ -45,7 +71,7 @@
 
 	* scripts/extract_symvers.in: Handle processor/OS specific or
 	unknown symbol binding strings from readelf.
-		
+
 2011-06-09  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/type_traits (__is_copy_assignable_impl,
diff --git a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
index 060bf8715d8..ce6f64214de 100644
--- a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
+// Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -29,10 +29,10 @@ int inc(int& i) { return ++i; }
 void test01()
 {
   const int dummy = 0;
-  std::bind(&inc, _1)(0);               // { dg-error  ""}
-  std::bind(&inc, std::ref(dummy))();  // { dg-error  ""}
-  std::bind(&inc, dummy)();  // { dg-error  ""}
-  std::bind(&inc, 0)();  // { dg-error  ""}
+  std::bind(&inc, _1)(0);               // { dg-error "" }
+  std::bind(&inc, std::ref(dummy))();  // { dg-error "" }
+  std::bind(&inc, dummy)();
+  std::bind(&inc, 0)();
 }
 
 struct Inc
@@ -46,8 +46,8 @@ struct Inc
 void test02()
 {
   const int dummy = 0;
-  std::bind(Inc(), _1)(dummy);                  // { dg-error  ""}
-  std::bind(&Inc::f, Inc(), std::ref(dummy))(); // { dg-error  ""}
+  std::bind(Inc(), _1)(dummy);                  // { dg-error "" }
+  std::bind(&Inc::f, Inc(), std::ref(dummy))(); // { dg-error "" }
 }
 
 int main()
@@ -55,5 +55,3 @@ int main()
   test01();
   test02();
 }
-
-// { dg-excess-errors "" }