2001-08-06 Phil Edwards <pme@sources.redhat.com>

	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE):  New macro, calls...
	(GLIBCPP_CHECK_SETRLIMIT):  ...this new macro, which also uses...
	(GLIBCPP_CHECK_SETRLIMIT_ancilliary):  ...this new macro.
	* configure.in (AM_CONFIG_HEADER):  Also generate testsuite_hooks.h.
	Call GLIBCPP_CONFIGURE_TESTSUITE.
	* aclocal.m4:  Regenerate.
	* config.h.in:  Regenerate.
	* configure:  Regenerate.

	* testsuite/lib/libstdc++-v3-dg.exp:  Download new header instead
	of old header.

	* testsuite_flags.in:  Add build dir's testsuite to INCLUDES.
	* testsuite/debug_assert.h:  Removed; contents merged into...
	* testsuite/testsuite_hooks.h.in:  ...here.  New file.
	* testsuite/17_intro/header_ciso646.cc:  No longer include
	debug_assert.h, include testsuite_hooks.h instead.
	* testsuite/17_intro/header_fstream.cc:  Likewise.
	* testsuite/17_intro/header_iomanip.cc:  Likewise.
	* testsuite/17_intro/header_ios.cc:  Likewise.
	* testsuite/17_intro/header_iosfwd.cc:  Likewise.
	* testsuite/17_intro/header_iostream.cc:  Likewise.
	* testsuite/17_intro/header_istream.cc:  Likewise.
	* testsuite/17_intro/header_ostream.cc:  Likewise.
	* testsuite/17_intro/header_sstream.cc:  Likewise.
	* testsuite/17_intro/header_streambuf.cc:  Likewise.
	* testsuite/18_support/numeric_limits.cc:  Likewise.
	* testsuite/19_diagnostics/stdexceptions.cc:  Likewise.
	* testsuite/20_util/allocator_members.cc:  Likewise.
	* testsuite/20_util/auto_ptr.cc:  Likewise.
	* testsuite/20_util/pairs.cc:  Likewise.
	* testsuite/21_strings/append.cc:  Likewise.
	* testsuite/21_strings/capacity.cc:  Likewise.
	* testsuite/21_strings/char_traits_requirements.cc:  Likewise.
	* testsuite/21_strings/compare.cc:  Likewise.
	* testsuite/21_strings/ctor_copy_dtor.cc:  Likewise.  Also set up
	call to (disabled) __set_testsuite_memlimit() wrapper.
	* testsuite/21_strings/element_access.cc:  Likewise.
	* testsuite/21_strings/find.cc:  Likewise.
	* testsuite/21_strings/insert.cc:  Likewise.  Also set up call to
	(disabled) __set_testsuite_memlimit() wrapper.
	* testsuite/21_strings/inserters_extractors.cc:  Likewise.
	* testsuite/21_strings/invariants.cc:  Likewise.
	* testsuite/21_strings/nonmember.cc:  Likewise.
	* testsuite/21_strings/operations.cc:  Likewise.
	* testsuite/21_strings/replace.cc:  Likewise.
	* testsuite/21_strings/rfind.cc:  Likewise.
	* testsuite/21_strings/substr.cc:  Likewise.
	* testsuite/22_locale/codecvt_char_char.cc:  Likewise.
	* testsuite/22_locale/codecvt_unicode_char.cc:  Likewise.
	* testsuite/22_locale/codecvt_unicode_wchar_t.cc:  Likewise.
	* testsuite/22_locale/codecvt_wchar_t_char.cc:  Likewise.
	* testsuite/22_locale/ctor_copy_dtor.cc:  Likewise.
	* testsuite/22_locale/ctype_char_members.cc:  Likewise.
	* testsuite/22_locale/ctype_wchar_t_members.cc:  Likewise.
	* testsuite/22_locale/facet.cc:  Likewise.
	* testsuite/22_locale/global_templates.cc:  Likewise.
	* testsuite/22_locale/members.cc:  Likewise.
	* testsuite/22_locale/numpunct_byname.cc:  Likewise.
	* testsuite/22_locale/numpunct_char_members.cc:  Likewise.
	* testsuite/22_locale/operators.cc:  Likewise.
	* testsuite/22_locale/static_members.cc:  Likewise.
	* testsuite/23_containers/bitset_ctor.cc:  Likewise.
	* testsuite/23_containers/bitset_members.cc:  Likewise.
	* testsuite/23_containers/bitset_shift.cc:  Likewise.
	* testsuite/23_containers/vector_capacity.cc:  Likewise.
	* testsuite/23_containers/vector_ctor.cc:  Likewise.
	* testsuite/23_containers/vector_element_access.cc:  Likewise.
	* testsuite/23_containers/vector_modifiers.cc:  Likewise.
	* testsuite/24_iterators/istreambuf_iterator.cc:  Likewise.
	* testsuite/24_iterators/iterator.cc:  Likewise.
	* testsuite/24_iterators/ostreambuf_iterator.cc:  Likewise.
	* testsuite/25_algorithms/binary_search.cc:  Likewise.
	* testsuite/25_algorithms/copy.cc:  Likewise.
	* testsuite/25_algorithms/heap.cc:  Likewise.
	* testsuite/25_algorithms/lower_bound.cc:  Likewise.
	* testsuite/25_algorithms/min_max.cc:  Likewise.
	* testsuite/25_algorithms/partition.cc:  Likewise.
	* testsuite/25_algorithms/rotate.cc:  Likewise.
	* testsuite/25_algorithms/sort.cc:  Likewise.
	* testsuite/26_numerics/c_math.cc:  Likewise.
	* testsuite/26_numerics/complex_inserters_extractors.cc:  Likewise.
	* testsuite/26_numerics/complex_value.cc:  Likewise.
	* testsuite/27_io/filebuf.cc:  Likewise.
	* testsuite/27_io/filebuf_members.cc:  Likewise.
	* testsuite/27_io/filebuf_virtuals.cc:  Likewise.
	* testsuite/27_io/fpos.cc:  Likewise.
	* testsuite/27_io/fstream_members.cc:  Likewise.
	* testsuite/27_io/ifstream_members.cc:  Likewise.
	* testsuite/27_io/ios_base_callbacks.cc:  Likewise.
	* testsuite/27_io/ios_base_members_static.cc:  Likewise.
	* testsuite/27_io/ios_base_storage.cc:  Likewise.
	* testsuite/27_io/ios_ctor.cc:  Likewise.
	* testsuite/27_io/ios_init.cc:  Likewise.
	* testsuite/27_io/ios_manip_basefield.cc:  Likewise.
	* testsuite/27_io/ios_manip_fmtflags.cc:  Likewise.
	* testsuite/27_io/ios_members.cc:  Likewise.
	* testsuite/27_io/istream_extractor_arith.cc:  Likewise.
	* testsuite/27_io/istream_extractor_char.cc:  Likewise.
	* testsuite/27_io/istream_extractor_other.cc:  Likewise.
	* testsuite/27_io/istream_manip.cc:  Likewise.
	* testsuite/27_io/istream_seeks.cc:  Likewise.
	* testsuite/27_io/istream_sentry.cc:  Likewise.
	* testsuite/27_io/istream_unformatted.cc:  Likewise.
	* testsuite/27_io/istringstream_members.cc:  Likewise.
	* testsuite/27_io/narrow_stream_objects.cc:  Likewise.
	* testsuite/27_io/ofstream_members.cc:  Likewise.
	* testsuite/27_io/ostream_inserter_arith.cc:  Likewise.
	* testsuite/27_io/ostream_inserter_char.cc:  Likewise.
	* testsuite/27_io/ostream_inserter_other.cc:  Likewise.
	* testsuite/27_io/ostream_manip.cc:  Likewise.
	* testsuite/27_io/ostream_seeks.cc:  Likewise.
	* testsuite/27_io/ostream_unformatted.cc:  Likewise.
	* testsuite/27_io/ostringstream_members.cc:  Likewise.
	* testsuite/27_io/streambuf.cc:  Likewise.
	* testsuite/27_io/stringbuf.cc:  Likewise.
	* testsuite/27_io/stringbuf_virtuals.cc:  Likewise.
	* testsuite/27_io/stringstream.cc:  Likewise.
	* testsuite/27_io/stringstream_members.cc:  Likewise.
	* testsuite/27_io/wide_stream_objects.cc:  Likewise.


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

105 files changed, 239 insertions, 155 deletions

diff --git a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
index 29f786abe43..8513b0864ef 100644
--- a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
@@ -23,7 +23,7 @@
 // { dg-do link }
 
 #include <ciso646>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 // 2.11 Keywords
diff --git a/libstdc++-v3/testsuite/17_intro/header_fstream.cc b/libstdc++-v3/testsuite/17_intro/header_fstream.cc
index 9d510acbffc..9f41f505719 100644
--- a/libstdc++-v3/testsuite/17_intro/header_fstream.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_fstream.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, fstream
 
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_iomanip.cc b/libstdc++-v3/testsuite/17_intro/header_iomanip.cc
index 68067d9dfb8..130e9767753 100644
--- a/libstdc++-v3/testsuite/17_intro/header_iomanip.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_iomanip.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, iomanip
 
 #include <iomanip>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_ios.cc b/libstdc++-v3/testsuite/17_intro/header_ios.cc
index 1f6c1aae004..bde8a85c6f4 100644
--- a/libstdc++-v3/testsuite/17_intro/header_ios.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_ios.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, ios
 
 #include <ios>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_iosfwd.cc b/libstdc++-v3/testsuite/17_intro/header_iosfwd.cc
index 4766e3596a3..d9846702774 100644
--- a/libstdc++-v3/testsuite/17_intro/header_iosfwd.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_iosfwd.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, iosfwd
 
 #include <iosfwd> 
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_iostream.cc b/libstdc++-v3/testsuite/17_intro/header_iostream.cc
index 7067709cdff..59b72fcce7b 100644
--- a/libstdc++-v3/testsuite/17_intro/header_iostream.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_iostream.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, iostream
 
 #include <iostream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_istream.cc b/libstdc++-v3/testsuite/17_intro/header_istream.cc
index e22550cee29..daa7f16d1aa 100644
--- a/libstdc++-v3/testsuite/17_intro/header_istream.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_istream.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, istream
 
 #include <istream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_ostream.cc b/libstdc++-v3/testsuite/17_intro/header_ostream.cc
index 93ddc1944f2..7af23d55800 100644
--- a/libstdc++-v3/testsuite/17_intro/header_ostream.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_ostream.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, ostream
 
 #include <ostream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_sstream.cc b/libstdc++-v3/testsuite/17_intro/header_sstream.cc
index 2a76ff97dec..b546c5498ce 100644
--- a/libstdc++-v3/testsuite/17_intro/header_sstream.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_sstream.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, sstream
 
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/17_intro/header_streambuf.cc b/libstdc++-v3/testsuite/17_intro/header_streambuf.cc
index 5eb39cf00db..de5b8abfd86 100644
--- a/libstdc++-v3/testsuite/17_intro/header_streambuf.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_streambuf.cc
@@ -21,7 +21,7 @@
 // 17.4.1.2 Headers, streambuf
 
 #include <streambuf>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits.cc b/libstdc++-v3/testsuite/18_support/numeric_limits.cc
index 4ff7f4a7059..6faaa92d5f2 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits.cc
@@ -21,7 +21,7 @@
 // 18.2.1.1 template class numeric_limits
 
 #include <limits>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 template<typename T>
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stdexceptions.cc b/libstdc++-v3/testsuite/19_diagnostics/stdexceptions.cc
index de9663cb53f..c118580ce50 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/stdexceptions.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/stdexceptions.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // libstdc++/1972
 void test01()
diff --git a/libstdc++-v3/testsuite/20_util/allocator_members.cc b/libstdc++-v3/testsuite/20_util/allocator_members.cc
index 1ee1d97385e..5d6cdd71600 100644
--- a/libstdc++-v3/testsuite/20_util/allocator_members.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator_members.cc
@@ -22,7 +22,7 @@
 
 #include <memory>
 #include <cstdlib>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 struct gnu { };
 
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr.cc b/libstdc++-v3/testsuite/20_util/auto_ptr.cc
index 95d8fd0ee1c..a1c3de2374e 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr.cc
@@ -19,7 +19,7 @@
 // 20.4.5 Template class auto_ptr [lib.auto.ptr]
 
 #include <memory>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 struct A
 {
diff --git a/libstdc++-v3/testsuite/20_util/pairs.cc b/libstdc++-v3/testsuite/20_util/pairs.cc
index 7b4b62f96b9..451ef19703b 100644
--- a/libstdc++-v3/testsuite/20_util/pairs.cc
+++ b/libstdc++-v3/testsuite/20_util/pairs.cc
@@ -21,7 +21,7 @@
 // 20.2.2 Pairs
 
 #include <utility>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 class gnu_obj
 {
diff --git a/libstdc++-v3/testsuite/21_strings/append.cc b/libstdc++-v3/testsuite/21_strings/append.cc
index 2333cc3dd87..c518e952671 100644
--- a/libstdc++-v3/testsuite/21_strings/append.cc
+++ b/libstdc++-v3/testsuite/21_strings/append.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/capacity.cc b/libstdc++-v3/testsuite/21_strings/capacity.cc
index 82202092a69..ed47e4e26f2 100644
--- a/libstdc++-v3/testsuite/21_strings/capacity.cc
+++ b/libstdc++-v3/testsuite/21_strings/capacity.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <cstdio>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 template<typename T>
   struct A { };
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits_requirements.cc b/libstdc++-v3/testsuite/21_strings/char_traits_requirements.cc
index f1e2080f1cd..d2406ed3599 100644
--- a/libstdc++-v3/testsuite/21_strings/char_traits_requirements.cc
+++ b/libstdc++-v3/testsuite/21_strings/char_traits_requirements.cc
@@ -21,7 +21,7 @@
 // 21.1.1 Characher traits requirements
 
 #include <string>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 int test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/compare.cc b/libstdc++-v3/testsuite/21_strings/compare.cc
index bf5b8daaeb9..d06dbfda4f9 100644
--- a/libstdc++-v3/testsuite/21_strings/compare.cc
+++ b/libstdc++-v3/testsuite/21_strings/compare.cc
@@ -31,7 +31,7 @@
 // things would be sorted in a dictionary.
 
 #include <string>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 enum want_value {lt=0, z=1, gt=2};
 
diff --git a/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc b/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc
index 3274d0dfc6b..355ce4d5dcd 100644
--- a/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc
+++ b/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc
@@ -23,7 +23,7 @@
 #include <new>
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 int test01(void)
 {
@@ -196,6 +196,7 @@ void test03()
 
 int main()
 { 
+  __set_testsuite_memlimit();
   test01();
   test02();
   test03();
diff --git a/libstdc++-v3/testsuite/21_strings/element_access.cc b/libstdc++-v3/testsuite/21_strings/element_access.cc
index 88b10a22cc7..d9525ba61b1 100644
--- a/libstdc++-v3/testsuite/21_strings/element_access.cc
+++ b/libstdc++-v3/testsuite/21_strings/element_access.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/find.cc b/libstdc++-v3/testsuite/21_strings/find.cc
index 88e6371e7a2..c6a4c1cbac8 100644
--- a/libstdc++-v3/testsuite/21_strings/find.cc
+++ b/libstdc++-v3/testsuite/21_strings/find.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/insert.cc b/libstdc++-v3/testsuite/21_strings/insert.cc
index 12af8e487fb..3c8dff0d5dc 100644
--- a/libstdc++-v3/testsuite/21_strings/insert.cc
+++ b/libstdc++-v3/testsuite/21_strings/insert.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 int test01(void)
 {
@@ -189,6 +189,7 @@ int test01(void)
 
 int main()
 { 
+  __set_testsuite_memlimit();
   test01();
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc b/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc
index 967571a75f3..b83e5aa4e60 100644
--- a/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc
+++ b/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc
@@ -30,7 +30,7 @@
 #include <fstream>
 #include <iostream>
 #include <iomanip>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/invariants.cc b/libstdc++-v3/testsuite/21_strings/invariants.cc
index 9f77660b7d2..d6dd05d6831 100644
--- a/libstdc++-v3/testsuite/21_strings/invariants.cc
+++ b/libstdc++-v3/testsuite/21_strings/invariants.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // Do a quick sanity check on known problems with element access and
 // ref-counted strings. These should all pass, regardless of the
diff --git a/libstdc++-v3/testsuite/21_strings/nonmember.cc b/libstdc++-v3/testsuite/21_strings/nonmember.cc
index fdc85d81e5f..451611e94f0 100644
--- a/libstdc++-v3/testsuite/21_strings/nonmember.cc
+++ b/libstdc++-v3/testsuite/21_strings/nonmember.cc
@@ -111,7 +111,7 @@ template<class charT, class traits, class Allocator>
 */
 
 #include <string>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 int test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/operations.cc b/libstdc++-v3/testsuite/21_strings/operations.cc
index d837320b9f9..b6c68ebcb9e 100644
--- a/libstdc++-v3/testsuite/21_strings/operations.cc
+++ b/libstdc++-v3/testsuite/21_strings/operations.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <cstdio>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 int test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/replace.cc b/libstdc++-v3/testsuite/21_strings/replace.cc
index 2c211b16309..b4aac625ea1 100644
--- a/libstdc++-v3/testsuite/21_strings/replace.cc
+++ b/libstdc++-v3/testsuite/21_strings/replace.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/21_strings/rfind.cc b/libstdc++-v3/testsuite/21_strings/rfind.cc
index 269816877de..af720f3820d 100644
--- a/libstdc++-v3/testsuite/21_strings/rfind.cc
+++ b/libstdc++-v3/testsuite/21_strings/rfind.cc
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // 21.3.6.2 basic_string rfind
 bool test01(void)
diff --git a/libstdc++-v3/testsuite/21_strings/substr.cc b/libstdc++-v3/testsuite/21_strings/substr.cc
index ce42eb75b53..0ec6ee35453 100644
--- a/libstdc++-v3/testsuite/21_strings/substr.cc
+++ b/libstdc++-v3/testsuite/21_strings/substr.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_char_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_char_char.cc
index 2055e427b1e..01542666ebe 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt_char_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt_char_char.cc
@@ -21,7 +21,7 @@
 // 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
 
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // Required instantiation, degenerate conversion.
 // codecvt<char, char, mbstate_t>
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_unicode_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_unicode_char.cc
index 2233bd2344f..8118c176a0b 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt_unicode_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt_unicode_char.cc
@@ -21,7 +21,7 @@
 // 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
 
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 using namespace std;
 
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_unicode_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt_unicode_wchar_t.cc
index 694f414b413..4547e01cee5 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt_unicode_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt_unicode_wchar_t.cc
@@ -21,7 +21,7 @@
 // 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
 
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 using namespace std;
 
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc
index e9f98a8a1f4..92235e8486f 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc
@@ -22,7 +22,7 @@
 
 #include <cwchar> // for mbstate_t
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 // Need to explicitly set the state(mbstate_t) to zero.
diff --git a/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc b/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc
index 7269d231da3..eda1cdb5013 100644
--- a/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc
@@ -23,7 +23,7 @@
 #include <cwchar> // for mbstate_t
 #include <locale>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 void test00()
diff --git a/libstdc++-v3/testsuite/22_locale/ctype_char_members.cc b/libstdc++-v3/testsuite/22_locale/ctype_char_members.cc
index ebea4031e3b..d13f97e13d9 100644
--- a/libstdc++-v3/testsuite/22_locale/ctype_char_members.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype_char_members.cc
@@ -31,7 +31,7 @@
 
 #include <locale>
 // NB: Don't include any other headers in this file.
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 class gnu_ctype: public std::ctype<char> { };
 
diff --git a/libstdc++-v3/testsuite/22_locale/ctype_wchar_t_members.cc b/libstdc++-v3/testsuite/22_locale/ctype_wchar_t_members.cc
index ccf784919f8..107a4d5e3c3 100644
--- a/libstdc++-v3/testsuite/22_locale/ctype_wchar_t_members.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype_wchar_t_members.cc
@@ -31,7 +31,7 @@
 
 #include <locale>
 // NB: Don't include any other headers in this file.
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 #if _GLIBCPP_USE_WCHAR_T
 class gnu_ctype: public std::ctype<wchar_t> {};
diff --git a/libstdc++-v3/testsuite/22_locale/facet.cc b/libstdc++-v3/testsuite/22_locale/facet.cc
index 170b5ff68ad..7f4d9953da4 100644
--- a/libstdc++-v3/testsuite/22_locale/facet.cc
+++ b/libstdc++-v3/testsuite/22_locale/facet.cc
@@ -25,7 +25,7 @@
 #include <stdexcept>
 #include <string>
 #include <iterator>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // 1 a class if a facet if it is publicly derived from another facet
 typedef std::istreambuf_iterator<char>		input_iterator;
diff --git a/libstdc++-v3/testsuite/22_locale/global_templates.cc b/libstdc++-v3/testsuite/22_locale/global_templates.cc
index afd00b060b5..49886aa18bf 100644
--- a/libstdc++-v3/testsuite/22_locale/global_templates.cc
+++ b/libstdc++-v3/testsuite/22_locale/global_templates.cc
@@ -22,7 +22,7 @@
 
 #include <cwchar> // for mbstate_t
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 typedef std::codecvt<char, char, std::mbstate_t> ccodecvt;
 
diff --git a/libstdc++-v3/testsuite/22_locale/members.cc b/libstdc++-v3/testsuite/22_locale/members.cc
index 1b441453f7b..3b579782d48 100644
--- a/libstdc++-v3/testsuite/22_locale/members.cc
+++ b/libstdc++-v3/testsuite/22_locale/members.cc
@@ -22,7 +22,7 @@
 
 #include <locale>
 #include <string>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // XXX This test is not working for non-glibc locale models.
 // { dg-do run { xfail *-*-* } }
diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_byname.cc b/libstdc++-v3/testsuite/22_locale/numpunct_byname.cc
index 26bde347c96..5fbbcc251be 100644
--- a/libstdc++-v3/testsuite/22_locale/numpunct_byname.cc
+++ b/libstdc++-v3/testsuite/22_locale/numpunct_byname.cc
@@ -21,7 +21,7 @@
 // 22.2.3.2 Template class numpunct_byname
 
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_char_members.cc b/libstdc++-v3/testsuite/22_locale/numpunct_char_members.cc
index 59bf126862f..853f7819e23 100644
--- a/libstdc++-v3/testsuite/22_locale/numpunct_char_members.cc
+++ b/libstdc++-v3/testsuite/22_locale/numpunct_char_members.cc
@@ -21,7 +21,7 @@
 // 22.2.3.1.1 nunpunct members
 
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // XXX This test is not working for non-glibc locale models.
 // { dg-do run { xfail *-*-* } }
diff --git a/libstdc++-v3/testsuite/22_locale/operators.cc b/libstdc++-v3/testsuite/22_locale/operators.cc
index e876748d302..2b9cd337da7 100644
--- a/libstdc++-v3/testsuite/22_locale/operators.cc
+++ b/libstdc++-v3/testsuite/22_locale/operators.cc
@@ -22,7 +22,7 @@
 
 #include <cwchar> // for mbstate_t
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 typedef std::codecvt<char, char, std::mbstate_t> ccodecvt;
 class gnu_codecvt: public ccodecvt { }; 
diff --git a/libstdc++-v3/testsuite/22_locale/static_members.cc b/libstdc++-v3/testsuite/22_locale/static_members.cc
index 7f951d81ff8..16e856a2ee4 100644
--- a/libstdc++-v3/testsuite/22_locale/static_members.cc
+++ b/libstdc++-v3/testsuite/22_locale/static_members.cc
@@ -22,7 +22,7 @@
 
 #include <cwchar> // for mbstate_t
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 typedef std::codecvt<char, char, std::mbstate_t> ccodecvt;
 class gnu_codecvt: public ccodecvt { }; 
diff --git a/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc b/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc
index 9741f24b463..8f9008ff058 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <bitset>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/23_containers/bitset_members.cc b/libstdc++-v3/testsuite/23_containers/bitset_members.cc
index d8de0710c7e..cef2cf99e52 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset_members.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset_members.cc
@@ -21,7 +21,7 @@
 // 23.3.5.2 bitset members
 
 #include <bitset>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/23_containers/bitset_shift.cc b/libstdc++-v3/testsuite/23_containers/bitset_shift.cc
index 3ca2ee3db18..35531bf5b4c 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset_shift.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset_shift.cc
@@ -22,7 +22,7 @@
 #include <set>
 #include <bitset>
 
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 static char original_bits[1024];
 static char left_shifted[1024];
diff --git a/libstdc++-v3/testsuite/23_containers/vector_capacity.cc b/libstdc++-v3/testsuite/23_containers/vector_capacity.cc
index b69e2abf1bb..a56f2ef40c4 100644
--- a/libstdc++-v3/testsuite/23_containers/vector_capacity.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector_capacity.cc
@@ -22,7 +22,7 @@
 // 23.2.4.2 vector capacity
 
 #include <vector>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 template<typename T>
   struct A { };
diff --git a/libstdc++-v3/testsuite/23_containers/vector_ctor.cc b/libstdc++-v3/testsuite/23_containers/vector_ctor.cc
index 94782bf2509..6ac74e778a6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector_ctor.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector_ctor.cc
@@ -21,7 +21,7 @@
 // 23.2.4.1 vector constructors, copy, and assignment
 
 #include <vector>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 template<typename T>
   struct A { };
diff --git a/libstdc++-v3/testsuite/23_containers/vector_element_access.cc b/libstdc++-v3/testsuite/23_containers/vector_element_access.cc
index 22ec0cf627f..5f5b5d231de 100644
--- a/libstdc++-v3/testsuite/23_containers/vector_element_access.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector_element_access.cc
@@ -23,7 +23,7 @@
 
 #include <vector>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 template<typename T>
 struct A { };
diff --git a/libstdc++-v3/testsuite/23_containers/vector_modifiers.cc b/libstdc++-v3/testsuite/23_containers/vector_modifiers.cc
index db18b9a41a3..1f0b338c3b7 100644
--- a/libstdc++-v3/testsuite/23_containers/vector_modifiers.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector_modifiers.cc
@@ -21,7 +21,7 @@
 // 23.2.4.3 vector modifiers
 
 #include <vector>
-#include "debug_assert.h"
+#include "testsuite_hooks.h"
 
 bool test = true;
 
diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator.cc
index 57713e2bd07..72758eed308 100644
--- a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator.cc
@@ -22,7 +22,7 @@
 
 #include <sstream>
 #include <iterator>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/24_iterators/iterator.cc b/libstdc++-v3/testsuite/24_iterators/iterator.cc
index b11da0c653a..a5a6974f80a 100644
--- a/libstdc++-v3/testsuite/24_iterators/iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/iterator.cc
@@ -21,7 +21,7 @@
 
 #include <string>
 #include <vector>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 int 
 string_stuff()
diff --git a/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator.cc b/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator.cc
index 68859f7c6d1..23ddee57c9f 100644
--- a/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator.cc
@@ -22,7 +22,7 @@
 
 #include <sstream>
 #include <iterator>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/25_algorithms/binary_search.cc b/libstdc++-v3/testsuite/25_algorithms/binary_search.cc
index 7e4396b4cb5..fda74d2a706 100644
--- a/libstdc++-v3/testsuite/25_algorithms/binary_search.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/binary_search.cc
@@ -19,7 +19,7 @@
 // 25.3.3 [lib.alg.binary.search] Binary search algorithms.
 
 #include <algorithm>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test = true;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy.cc b/libstdc++-v3/testsuite/25_algorithms/copy.cc
index f08694f28b3..d8fbb9d2b00 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy.cc
@@ -19,7 +19,7 @@
 // 25.2.12 [lib.alg.partitions] Partitions.
 
 #include <algorithm>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test = true;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap.cc b/libstdc++-v3/testsuite/25_algorithms/heap.cc
index 452b6aaa905..e78fae8477d 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap.cc
@@ -20,7 +20,7 @@
 
 #include <algorithm>
 //#include <cmath>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test = true;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
index cb9e8b5e4e3..f6bf336597c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
@@ -17,7 +17,7 @@
 // USA.
 
 #include <algorithm>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00316.html
 struct foo { };
diff --git a/libstdc++-v3/testsuite/25_algorithms/min_max.cc b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
index a60cd58b097..198247b6f9e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min_max.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
@@ -19,7 +19,7 @@
 // USA.
 
 #include <algorithm>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/25_algorithms/partition.cc b/libstdc++-v3/testsuite/25_algorithms/partition.cc
index 6623cd3f0ed..3424dcf80fd 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partition.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partition.cc
@@ -20,7 +20,7 @@
 
 #include <algorithm>
 #include <functional>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test = true;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate.cc b/libstdc++-v3/testsuite/25_algorithms/rotate.cc
index e80d3cd3cd3..5102a649fdc 100644
--- a/libstdc++-v3/testsuite/25_algorithms/rotate.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate.cc
@@ -19,7 +19,7 @@
 // 25.?? algorithms, rotate()
 
 #include <algorithm>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 #include <list>
 
 bool test = true;
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort.cc b/libstdc++-v3/testsuite/25_algorithms/sort.cc
index f26dd018727..2fcc6384ccf 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort.cc
@@ -19,7 +19,7 @@
 // 25.3.1 algorithms, sort()
 
 #include <algorithm>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test = true;
 
diff --git a/libstdc++-v3/testsuite/26_numerics/c_math.cc b/libstdc++-v3/testsuite/26_numerics/c_math.cc
index df19b02e65b..f01e4868b44 100644
--- a/libstdc++-v3/testsuite/26_numerics/c_math.cc
+++ b/libstdc++-v3/testsuite/26_numerics/c_math.cc
@@ -20,7 +20,7 @@
 // USA.
 
 #include <cmath>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // test compilation.
 int
diff --git a/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc b/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
index 71ac48d456a..8161ee1aeb5 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
@@ -24,7 +24,7 @@
 #include <string>
 #include <sstream>
 #include <complex>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 #include <cmath>
 
 template<typename R>
diff --git a/libstdc++-v3/testsuite/26_numerics/complex_value.cc b/libstdc++-v3/testsuite/26_numerics/complex_value.cc
index c6105c36f6d..99f477a5fa1 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex_value.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex_value.cc
@@ -20,7 +20,7 @@
 // USA.
 
 #include <complex>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/filebuf.cc b/libstdc++-v3/testsuite/27_io/filebuf.cc
index 4dc4acc94eb..87410d01e6d 100644
--- a/libstdc++-v3/testsuite/27_io/filebuf.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf.cc
@@ -26,7 +26,7 @@
 // @diff@ %-*.tst %*.txt
 
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 const char carray_01[] = "santa cruz or sandiego?";
 const char carray_02[] = "memphis, new orleans, and savanah";
diff --git a/libstdc++-v3/testsuite/27_io/filebuf_members.cc b/libstdc++-v3/testsuite/27_io/filebuf_members.cc
index 59d6ea13acd..4d61ec10a23 100644
--- a/libstdc++-v3/testsuite/27_io/filebuf_members.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf_members.cc
@@ -27,7 +27,7 @@
 #include <cassert>
 #include <unistd.h>
 #include <fcntl.h>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // verify that std::filebuf doesn't close files that it didn't open
 // when using the following std::filebuf ctor:
diff --git a/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc b/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc
index bcf0503f7f4..0d782641d95 100644
--- a/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc
@@ -21,7 +21,7 @@
 // 27.8.1.4 Overridden virtual functions
 
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/fpos.cc b/libstdc++-v3/testsuite/27_io/fpos.cc
index 6e852fd9486..2f52fd3c65e 100644
--- a/libstdc++-v3/testsuite/27_io/fpos.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos.cc
@@ -31,7 +31,7 @@
 
 #include <cwchar> // for mbstate_t
 #include <ios>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/fstream_members.cc b/libstdc++-v3/testsuite/27_io/fstream_members.cc
index 13520119f8d..136252b8efb 100644
--- a/libstdc++-v3/testsuite/27_io/fstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/fstream_members.cc
@@ -21,7 +21,7 @@
 // 27.8.1.13 member functions (fstream_members)
 
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void 
 redirect_buffer(std::ios& stream, std::streambuf* new_buf) 
diff --git a/libstdc++-v3/testsuite/27_io/ifstream_members.cc b/libstdc++-v3/testsuite/27_io/ifstream_members.cc
index 6a4961a82a1..ad21fe5c8d1 100644
--- a/libstdc++-v3/testsuite/27_io/ifstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/ifstream_members.cc
@@ -22,7 +22,7 @@
 
 #include <istream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 const char name_01[] = "ifstream_members-1.tst";
 const char name_02[] = "ifstream_members-1.txt";
diff --git a/libstdc++-v3/testsuite/27_io/ios_base_callbacks.cc b/libstdc++-v3/testsuite/27_io/ios_base_callbacks.cc
index 84ca815e356..aabb778a527 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base_callbacks.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base_callbacks.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 const std::string str01("the nubians of plutonia");
 std::string str02;
diff --git a/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc b/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc
index 0a30506868b..1e7df6a295f 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc
@@ -28,7 +28,7 @@
 #include <sstream>
 #include <iostream>
 
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // N.B. Once we have called sync_with_stdio(false), we can never go back.
 
diff --git a/libstdc++-v3/testsuite/27_io/ios_base_storage.cc b/libstdc++-v3/testsuite/27_io/ios_base_storage.cc
index 7a86c01a8ae..d6b6d983b5f 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base_storage.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base_storage.cc
@@ -23,7 +23,7 @@
 #include <sstream>
 #include <iostream>
 
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // http://gcc.gnu.org/ml/gcc-bugs/2000-12/msg00413.html
 void test01() 
diff --git a/libstdc++-v3/testsuite/27_io/ios_ctor.cc b/libstdc++-v3/testsuite/27_io/ios_ctor.cc
index 10fd9bb8dc0..5736aebaa35 100644
--- a/libstdc++-v3/testsuite/27_io/ios_ctor.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_ctor.cc
@@ -31,7 +31,7 @@
 
 #include <ios>
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/ios_init.cc b/libstdc++-v3/testsuite/27_io/ios_init.cc
index 3963cb6d776..ef7cdf49586 100644
--- a/libstdc++-v3/testsuite/27_io/ios_init.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_init.cc
@@ -31,7 +31,7 @@
 
 #include <fstream>
 #include <iostream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 class gnu_filebuf: public std::filebuf
 {
diff --git a/libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc b/libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc
index 717bebb322c..2a3df628873 100644
--- a/libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <locale>
 #include <iomanip>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 			
 struct MyNP : std::numpunct<char>
 {
diff --git a/libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc b/libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc
index 4dcf748f019..5fe1194c481 100644
--- a/libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <locale>
 #include <iomanip>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 struct MyNP : std::numpunct<char>
 {
diff --git a/libstdc++-v3/testsuite/27_io/ios_members.cc b/libstdc++-v3/testsuite/27_io/ios_members.cc
index a7ac3e5ac54..df00c6a4ce5 100644
--- a/libstdc++-v3/testsuite/27_io/ios_members.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_members.cc
@@ -31,7 +31,7 @@
 
 #include <ios>
 // NB: Don't include any other headers in this file.
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith.cc
index f0d386c4c58..e6bb415d2ef 100644
--- a/libstdc++-v3/testsuite/27_io/istream_extractor_arith.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith.cc
@@ -25,7 +25,7 @@
 #include <ostream>
 #include <sstream>
 #include <locale>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 std::string str_01;
 std::string str_02("true false 0 1 110001");
diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_char.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_char.cc
index d488c146f67..87ab77d88a0 100644
--- a/libstdc++-v3/testsuite/27_io/istream_extractor_char.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_extractor_char.cc
@@ -22,7 +22,7 @@
 
 #include <istream>
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01() {
 
diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc
index c7053d1daad..fbf8f4293c6 100644
--- a/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc
@@ -25,7 +25,7 @@
 #include <istream>
 #include <sstream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 // stringbufs.
diff --git a/libstdc++-v3/testsuite/27_io/istream_manip.cc b/libstdc++-v3/testsuite/27_io/istream_manip.cc
index 661e075cf09..75eb79f135a 100644
--- a/libstdc++-v3/testsuite/27_io/istream_manip.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_manip.cc
@@ -23,7 +23,7 @@
 #include <istream>
 #include <sstream>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/27_io/istream_seeks.cc b/libstdc++-v3/testsuite/27_io/istream_seeks.cc
index a8f138eb7b4..dac5f3cf9eb 100644
--- a/libstdc++-v3/testsuite/27_io/istream_seeks.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_seeks.cc
@@ -26,7 +26,7 @@
 #include <istream>
 #include <sstream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/istream_sentry.cc b/libstdc++-v3/testsuite/27_io/istream_sentry.cc
index 2fa6a19fce0..88dcb91df24 100644
--- a/libstdc++-v3/testsuite/27_io/istream_sentry.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_sentry.cc
@@ -31,7 +31,7 @@
 
 #include <istream>
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
index 35b1d1ff6a7..19c2c9242e6 100644
--- a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
@@ -26,7 +26,7 @@
 #include <istream>
 #include <sstream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 int
 test01()
diff --git a/libstdc++-v3/testsuite/27_io/istringstream_members.cc b/libstdc++-v3/testsuite/27_io/istringstream_members.cc
index 58885b934e7..cfc473621a2 100644
--- a/libstdc++-v3/testsuite/27_io/istringstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/istringstream_members.cc
@@ -21,7 +21,7 @@
 // 27.7.2.2 member functions (istringstream_members)
 
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/narrow_stream_objects.cc b/libstdc++-v3/testsuite/27_io/narrow_stream_objects.cc
index 630be99685b..c420449ae04 100644
--- a/libstdc++-v3/testsuite/27_io/narrow_stream_objects.cc
+++ b/libstdc++-v3/testsuite/27_io/narrow_stream_objects.cc
@@ -66,7 +66,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // Include iostream last, just to make is as difficult as possible to
 // properly initialize the standard iostream objects.
diff --git a/libstdc++-v3/testsuite/27_io/ofstream_members.cc b/libstdc++-v3/testsuite/27_io/ofstream_members.cc
index 7a10072b94d..79c86e13066 100644
--- a/libstdc++-v3/testsuite/27_io/ofstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/ofstream_members.cc
@@ -22,7 +22,7 @@
 
 #include <ostream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 const char name_01[] = "ofstream_members-1.tst";
 const char name_02[] = "ofstream_members-1.txt";
diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc
index 1329cf721cd..af45aaafaf5 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc
@@ -25,7 +25,7 @@
 #include <locale>
 #include <sstream>
 #include <limits>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 using namespace std;
 
diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc
index 3270f80eda4..c8a4a73d4f7 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc
@@ -24,7 +24,7 @@
 #include <ostream>
 #include <sstream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // ofstream
 bool test01()
diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc
index 6dfcfc7cdc7..806c500bff1 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc
@@ -26,7 +26,7 @@
 #include <ostream>
 #include <sstream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 const int size = 1000;
 const char name_01[] = "ostream_inserter_other-1.tst";
diff --git a/libstdc++-v3/testsuite/27_io/ostream_manip.cc b/libstdc++-v3/testsuite/27_io/ostream_manip.cc
index e89cc666735..ee75cad964b 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_manip.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_manip.cc
@@ -23,7 +23,7 @@
 #include <ostream>
 #include <sstream>
 #include <stdexcept>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 bool test01(void)
 {
diff --git a/libstdc++-v3/testsuite/27_io/ostream_seeks.cc b/libstdc++-v3/testsuite/27_io/ostream_seeks.cc
index 52c28604004..7022a2f594f 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_seeks.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_seeks.cc
@@ -23,7 +23,7 @@
 #include <ostream>
 #include <sstream>
 #include <fstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 bool test01()
diff --git a/libstdc++-v3/testsuite/27_io/ostream_unformatted.cc b/libstdc++-v3/testsuite/27_io/ostream_unformatted.cc
index b2ba70ec86d..a55ac3ca45b 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_unformatted.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_unformatted.cc
@@ -20,7 +20,7 @@
 
 #include <sstream>
 #include <ostream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 
 void test01()
diff --git a/libstdc++-v3/testsuite/27_io/ostringstream_members.cc b/libstdc++-v3/testsuite/27_io/ostringstream_members.cc
index 856544cb625..4e7f861b516 100644
--- a/libstdc++-v3/testsuite/27_io/ostringstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/ostringstream_members.cc
@@ -21,7 +21,7 @@
 // 27.7.3.2 member functions (ostringstream_members)
 
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/streambuf.cc b/libstdc++-v3/testsuite/27_io/streambuf.cc
index 68456432b73..62c965ff253 100644
--- a/libstdc++-v3/testsuite/27_io/streambuf.cc
+++ b/libstdc++-v3/testsuite/27_io/streambuf.cc
@@ -33,7 +33,7 @@
 #include <streambuf>
 #include <string>
 #include <ostream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 class testbuf : public std::streambuf
 {
diff --git a/libstdc++-v3/testsuite/27_io/stringbuf.cc b/libstdc++-v3/testsuite/27_io/stringbuf.cc
index 4ab65758d4b..540f0af2735 100644
--- a/libstdc++-v3/testsuite/27_io/stringbuf.cc
+++ b/libstdc++-v3/testsuite/27_io/stringbuf.cc
@@ -19,7 +19,7 @@
 // USA.
 
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 std::string str_01("mykonos. . . or what?");
 std::string str_02("paris, or sainte-maxime?");
diff --git a/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc b/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc
index ff367c95e36..7e20164712a 100644
--- a/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc
+++ b/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc
@@ -21,7 +21,7 @@
 // 27.7.1.3 Overridden virtual functions
 
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/stringstream.cc b/libstdc++-v3/testsuite/27_io/stringstream.cc
index 8a841f2f854..e66e26749b6 100644
--- a/libstdc++-v3/testsuite/27_io/stringstream.cc
+++ b/libstdc++-v3/testsuite/27_io/stringstream.cc
@@ -31,7 +31,7 @@
 #include <vector>
 #include <string>
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // 01: sanity checks for strings, stringbufs
 std::string 
diff --git a/libstdc++-v3/testsuite/27_io/stringstream_members.cc b/libstdc++-v3/testsuite/27_io/stringstream_members.cc
index 5b3ead1b2d0..4de7b8c5241 100644
--- a/libstdc++-v3/testsuite/27_io/stringstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/stringstream_members.cc
@@ -21,7 +21,7 @@
 // 27.7.6 member functions (stringstream_members)
 
 #include <sstream>
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/27_io/wide_stream_objects.cc b/libstdc++-v3/testsuite/27_io/wide_stream_objects.cc
index 91cb21be765..022f6eff327 100644
--- a/libstdc++-v3/testsuite/27_io/wide_stream_objects.cc
+++ b/libstdc++-v3/testsuite/27_io/wide_stream_objects.cc
@@ -71,7 +71,7 @@
   #include <cwchar>
   #include <cwctype>
 #endif
-#include <debug_assert.h>
+#include <testsuite_hooks.h>
 
 // Include iostream last, just to make is as difficult as possible to
 // properly initialize the standard iostream objects.
diff --git a/libstdc++-v3/testsuite/debug_assert.h b/libstdc++-v3/testsuite/debug_assert.h
deleted file mode 100644
index dbd6e984056..00000000000
--- a/libstdc++-v3/testsuite/debug_assert.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// 20000810  Brent Verner <brent@rcfile.org>
-//
-// Copyright (C) 2000 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 2, 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 COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-//
-//
-// Purpose:
-//   This file is included in the various testsuite programs to provide
-//   #define(able) assert() behavior for debugging/testing. It may be
-//   a suitable location for other furry woodland creatures as well.
-//
-// Notes:
-//   If you find yourself compiling small test progs as much as I
-//   do, you can move this file to a location your compiler(s)
-//   will find, and possibly add more cheap debugging stuff...
-//
-
-#ifndef _CPP_DEBUG_ASSERT_H
-#define _CPP_DEBUG_ASSERT_H
-
-#ifdef DEBUG_ASSERT
-# include <cassert>
-# define VERIFY(fn) assert(fn)
-
-#else
-# define VERIFY(fn) test &= (fn)
-// should we define this here to make sure no 'unexpected' failures
-// happen, or do we require that it be defined in any scope where
-// the VERIFY macro is used???
-//
-// static bool test = true;
-#endif
-
-
-#endif // _CPP_DEBUG_ASSERT_H
-
diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
index 6aae10fe77a..dbd81ac2098 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
@@ -53,9 +53,9 @@ proc libstdc++-v3-init { args } {
     # Do a bunch of handstands and backflips for cross compiling and
     # finding simulators...
     if [is_remote host] {
-        set header [remote_download host ${srcdir}/debug_assert.h]
+        set header [remote_download host ${blddir}/testsuite/testsuite_hooks.h]
         if { $header == "" } {
-            verbose -log "Unable to download ${srcdir}/debug_assert.h to host."
+            verbose -log "Unable to download ${blddir}/testsuite/testsuite_hooks.h to host."
             return "untested"
         }
       set cxx [transform "g++"]
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h.in b/libstdc++-v3/testsuite/testsuite_hooks.h.in
new file mode 100644
index 00000000000..bee264fab47
--- /dev/null
+++ b/libstdc++-v3/testsuite/testsuite_hooks.h.in
@@ -0,0 +1,133 @@
+// Utility subroutines for the C++ library testsuite.
+//
+// Copyright (C) 2000, 2001 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+//
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+// This file provides the following:
+//
+// 1)  VERIFY(), via DEBUG_ASSERT, from Brent Verner <brent@rcfile.org>.
+//   This file is included in the various testsuite programs to provide
+//   #define(able) assert() behavior for debugging/testing. It may be
+//   a suitable location for other furry woodland creatures as well.
+//
+// 2)  __set_testsuite_memlimit()
+//   __set_testsuite_memlimit() uses setrlimit() to restrict dynamic memory
+//   allocation.  We provide a default memory limit if none is passed by the
+//   calling application.  The argument to __set_testsuite_memlimit() is the
+//   limit in megabytes (a floating-point number).  If NO_MEM_LIMITS is
+//   #defined before including this header, then no limiting is attempted.
+
+#ifndef _GLIBCPP_TESTSUITE_HOOKS_H
+#define _GLIBCPP_TESTSUITE_HOOKS_H
+
+
+/*******
+ * VERIFY(), via DEBUG_ASSERT, from Brent Verner <brent@rcfile.org>.
+*/
+#ifdef DEBUG_ASSERT
+# include <cassert>
+# define VERIFY(fn) assert(fn)
+
+#else
+
+# define VERIFY(fn) test &= (fn)
+// should we define this here to make sure no 'unexpected' failures
+// happen, or do we require that it be defined in any scope where
+// the VERIFY macro is used???
+//
+// static bool test = true;
+#endif
+
+
+/*******
+ * __set_testsuite_memlimit()
+*/
+// The RLIMIT_* macros used will be as many of the following as we can find,
+// and they will be used in this order, for whatever difference it makes:
+//   RLIMIT_DATA
+//   RLIMIT_RSS
+//   RLIMIT_VMEM
+//   RLIMIT_AS
+
+#define NO_MEM_LIMITS
+
+// The following lines will be changed by configure...
+#undef HAVE_SYS_RESOURCE_H
+#undef HAVE_UNISTD_H
+#undef HAVE_MEMLIMIT_DATA
+#undef HAVE_MEMLIMIT_RSS
+#undef HAVE_MEMLIMIT_VMEM
+#undef HAVE_MEMLIMIT_AS
+
+// ...and the results used here.
+#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_UNISTD_H) && !defined(NO_MEM_LIMITS)
+
+#include <sys/resource.h>
+#include <unistd.h>
+
+#ifndef MEMLIMIT_MB
+#define MEMLIMIT_MB 16.0
+#endif
+
+void
+__set_testsuite_memlimit(float megs = MEMLIMIT_MB)
+{
+    struct rlimit r;
+    r.rlim_cur = (rlim_t)(megs * 1048576);
+
+    // heap size, seems to be common
+#if HAVE_MEMLIMIT_DATA
+    setrlimit (RLIMIT_DATA, &r);
+#endif
+
+    // resident set size -- Linux?
+#if HAVE_MEMLIMIT_RSS
+    setrlimit (RLIMIT_RSS, &r);
+#endif
+
+    // mapped memory (brk+mmap) -- Solaris?
+#if HAVE_MEMLIMIT_VMEM
+    setrlimit (RLIMIT_VMEM, &r);
+#endif
+
+    // virtual memory, seems to be common
+#if HAVE_MEMLIMIT_AS
+    setrlimit (RLIMIT_AS, &r);
+#endif
+}
+
+#else
+// The headers needed for resource limiting are not available.  This is
+// safe, but means that no memory limits will be applied... ouch.
+#define __set_testsuite_memlimit(__junk)
+#endif
+
+
+
+
+#endif // _GLIBCPP_TESTSUITE_HOOKS_H
+