libstdc++.exp ([check_v3_target_debug_mode]): Fix so that it really detects when…

libstdc++.exp ([check_v3_target_debug_mode]): Fix so that it really detects when debug mode is activated.

2010-09-03  François Dumont <francois.cppdevs@free.fr>

        * testsuite/lib/libstdc++.exp ([check_v3_target_debug_mode]): Fix so
        that it really detects when debug mode is activated.
        * testsuite/util/debug/construct_neg.h, insert_neg.h, assign_neg.h:
        Remove, content moved...
        * testsuite/util/debug/checks.h: ... here. Modify checks to take the
	type of the container to test rather than an intermediate container
        type traits helper.
	* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Update to
	use dg-require-debug-mode when necessary and use new check functions.
	* testsuite/23_containers/unordered_map/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_map/debug/construct2_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/construct3_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/construct4_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc:
	Likewise.
	* testsuite/23_containers/vector/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/assign4_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_set/debug/construct2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct4_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign4_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign4_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc: 
	Likewise.
	* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert4_neg.cc: Likewise.

	* testsuite/23_containers/unordered_map/debug/cont_traits.h: Remove.
	* testsuite/23_containers/unordered_map/debug/debug_cont_traits.h:
	Likewise.
	* testsuite/23_containers/multimap/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/multimap/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/set/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/set/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/cont_traits.h:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/
	debug_cont_traits.h: Likewise.
	* testsuite/23_containers/vector/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/vector/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_set/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_set/debug/debug_cont_traits.h:
	Likewise.
	* testsuite/23_containers/deque/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/deque/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/multiset/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/multiset/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/list/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/list/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/cont_traits.h: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/
	debug_cont_traits.h: Likewise.
	* testsuite/23_containers/map/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/map/debug/debug_cont_traits.h: Likewise.

	* testsuite/21_strings/basic_string/element_access/char: Tidy.
	* testsuite/21_strings/basic_string/element_access/wchar_t: Likewise.

From-SVN: r163837

libstdc++-v3/ChangeLog

+2010-09-03  François Dumont <francois.cppdevs@free.fr>
+
+        * testsuite/lib/libstdc++.exp ([check_v3_target_debug_mode]): Fix so
+        that it really detects when debug mode is activated.
+        * testsuite/util/debug/construct_neg.h, insert_neg.h, assign_neg.h:
+        Remove, content moved...
+        * testsuite/util/debug/checks.h: ... here. Modify checks to take the
+	type of the container to test rather than an intermediate container
+        type traits helper.
+	* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Update to
+	use dg-require-debug-mode when necessary and use new check functions.
+	* testsuite/23_containers/unordered_map/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/vector/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/assign4_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign4_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign4_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert4_neg.cc: Likewise.
+
+	* testsuite/23_containers/unordered_map/debug/cont_traits.h: Remove.
+	* testsuite/23_containers/unordered_map/debug/debug_cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/multimap/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/multimap/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/set/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/set/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/
+	debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/vector/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/vector/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_set/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_set/debug/debug_cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/deque/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/deque/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/multiset/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/multiset/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/list/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/list/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/
+	debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/map/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/map/debug/debug_cont_traits.h: Likewise.
+
+	* testsuite/21_strings/basic_string/element_access/char: Tidy.
+	* testsuite/21_strings/basic_string/element_access/wchar_t: Likewise.
+
 2010-09-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR libstdc++/40974

libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc

 // { dg-do run { xfail *-*-* } }
+// { dg-options "-O0" }
 // { dg-require-debug-mode "" }
-// { dg-options "-O0 -D_GLIBCXX_DEBUG" }
 
 // Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 //
@@ -19,7 +19,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-
 #include <string>
 
 // libstdc++/21674

libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc

 // { dg-do run { xfail *-*-* } }
+// { dg-options "-O0" }
 // { dg-require-debug-mode "" }
-// { dg-options "-O0 -D_GLIBCXX_DEBUG" }
 
 // Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 //
@@ -19,7 +19,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-
 #include <string>
 
 // libstdc++/21674

libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_assign1<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_assign2<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_assign3<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_assign1<__gnu_debug::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <deque>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::deque<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };

libstdc++-v3/testsuite/23_containers/deque/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/deque>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::deque<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };

libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::deque<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_assign1<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_assign2<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_assign3<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/list>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_assign1<__gnu_debug::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/list>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <list>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::list<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };

libstdc++-v3/testsuite/23_containers/list/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/list>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::list<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };

libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/list>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::list<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/map/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/multimap/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/multiset/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::set<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/set/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::set<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc

@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc

@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::set<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc

@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::unordered_map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/unordered_map/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::unordered_map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc

@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::unordered_map<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc

@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::unordered_multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::unordered_multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return std::pair<Type, Type>(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc

@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::unordered_multimap<int, int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::unordered_multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::unordered_multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::unordered_multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc

@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::unordered_multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <unordered_set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::unordered_multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/debug_cont_traits.h

-// Copyright (C) 2010 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/unordered_set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::unordered_multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::unordered_multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::unordered_multiset<int> >();
 }
 
 int main()

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc

@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::unordered_multiset<int> >();
 }
 
 int main()