*: Change __gnu_cxx_test to __gnu_test.

2003-07-24  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/*: Change __gnu_cxx_test to __gnu_test.

From-SVN: r69761

libstdc++-v3/ChangeLog

+2003-07-24  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/*: Change __gnu_cxx_test to __gnu_test.
+
 2003-07-24  Nathan Myers  <ncm-nospam@cantrip.org>
 
         * testsuite/23_containers/map_operators.cc: Conform to 

libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc

@@ -155,7 +155,7 @@ void test01(void)
 
 int main()
 { 
-  __gnu_cxx_test::set_memory_limits();
+  __gnu_test::set_memory_limits();
   test01();
   return 0;
 }

libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc

@@ -155,7 +155,7 @@ void test01(void)
 
 int main()
 { 
-  __gnu_cxx_test::set_memory_limits();
+  __gnu_test::set_memory_limits();
   test01();
   return 0;
 }

libstdc++-v3/testsuite/21_strings/basic_string/insert/char/1.cc

@@ -189,7 +189,7 @@ int test01(void)
 
 int main()
 { 
-  __gnu_cxx_test::set_memory_limits();
+  __gnu_test::set_memory_limits();
   test01();
   return 0;
 }

libstdc++-v3/testsuite/21_strings/basic_string/insert/wchar_t/1.cc

@@ -189,7 +189,7 @@ int test01(void)
 
 int main()
 { 
-  __gnu_cxx_test::set_memory_limits();
+  __gnu_test::set_memory_limits();
   test01();
   return 0;
 }

libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc

@@ -33,7 +33,7 @@ void test02()
   bool test = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc

@@ -33,7 +33,7 @@ void test03()
   bool test = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc

@@ -33,7 +33,7 @@ void test04()
   bool test = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc

@@ -33,7 +33,7 @@ void test02()
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
   bool 			test = true;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc

@@ -33,7 +33,7 @@ void test03()
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
   bool 			test = true;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc

@@ -33,7 +33,7 @@ void test04()
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
   bool 			test = true;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc

@@ -88,7 +88,7 @@ void test02()
   wmemset(i_ref, 0xdeadbeef, size + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc

@@ -102,7 +102,7 @@ void test03()
   wmemset(i_ref, 0xdeadbeef, size + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc

@@ -110,7 +110,7 @@ void test04()
   wmemset(i_ref, 0xdeadbeef, esize + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc

@@ -60,7 +60,7 @@ void test07()
   wmemset(i_ref, 0xdeadbeef, size + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc

@@ -109,7 +109,7 @@ void test08()
   wmemset(i_ref, 0xdeadbeef, esize + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc

@@ -111,7 +111,7 @@ void test09()
   int_type*		ito = i_arr;
   int_type*		ito_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc

@@ -61,7 +61,7 @@ void test02()
     "\xff";
   int 			size = strlen(e_lit);
 
-  locale  loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale  loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc

@@ -61,7 +61,7 @@ void test03()
     "\xff";
   int 			size = strlen(e_lit);
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc

@@ -100,7 +100,7 @@ void test04()
   int 			esize = strlen(e_lit);
   int 			isize = wcslen(i_lit);
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc

@@ -52,7 +52,7 @@ void test07()
   const ext_type*       efrom_next;
   int 			size = strlen(e_lit);
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc

@@ -31,7 +31,7 @@ void test02()
   bool test = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale  loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale  loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc

@@ -31,7 +31,7 @@ void test03()
   bool test = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc

@@ -31,7 +31,7 @@ void test04()
   bool test = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc

@@ -86,7 +86,7 @@ void test02()
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale  loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale  loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc

@@ -100,7 +100,7 @@ void test03()
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc

@@ -107,7 +107,7 @@ void test04()
   memset(e_ref, 0xf0, esize + 1);
   ext_type*		eto_next;
 
-  locale  loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale  loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc

@@ -58,7 +58,7 @@ void test03()
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc

@@ -71,7 +71,7 @@ void test02()
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc

@@ -85,7 +85,7 @@ void test03()
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc

@@ -80,7 +80,7 @@ void test04()
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
+  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 

libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc

@@ -33,9 +33,9 @@ void test01()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc

@@ -33,9 +33,9 @@ void test02()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc

@@ -33,7 +33,7 @@ void test03()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets

libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_env.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc

@@ -33,9 +33,9 @@ void test01()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc

@@ -37,9 +37,9 @@ void test02()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc

@@ -33,7 +33,7 @@ void test03()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets

libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc

@@ -36,7 +36,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc

@@ -36,7 +36,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc

@@ -33,9 +33,9 @@ void test02()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_env.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc

@@ -36,9 +36,9 @@ void test02()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc

@@ -36,7 +36,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc

@@ -36,7 +36,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc

@@ -32,9 +32,9 @@ void test02()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc

@@ -32,7 +32,7 @@ void test03()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets

libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test02);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test02);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc

@@ -36,9 +36,9 @@ void test02()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );

libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc

@@ -32,7 +32,7 @@ void test03()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets

libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test02);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test02);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/collate_byname/1.cc

@@ -32,7 +32,7 @@ void test01()
   string str;
   locale loc_c = locale::classic();
 
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   str = loc_de.name();
 
   locale loc_byname(locale::classic(), new collate_byname<char>("de_DE"));

libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc

@@ -67,7 +67,7 @@ void test02()
     }   
 
   // "de_DE"
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   const ctype<char>& ctype_de = use_facet<ctype<char> >(loc_de); 
   for (int i = 0; i < max; ++i)
     {

libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_env.cc

@@ -36,7 +36,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc

@@ -36,7 +36,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc

@@ -67,7 +67,7 @@ void test02()
     }   
 
   // "de_DE"
-  locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
+  locale loc_de = __gnu_test::try_named_locale("de_DE");
   const ctype<wchar_t>& ctype_de = use_facet<ctype<wchar_t> >(loc_de); 
   for (int i = 0; i < max; ++i)
     {

libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc

@@ -38,7 +38,7 @@ void test03()
   using namespace std;
   bool test = true;
 
-  locale loc = __gnu_cxx_test::try_named_locale("se_NO.UTF-8");
+  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
   const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
 
   const wchar_t* wstrlit = L"\x80";

libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc

@@ -32,7 +32,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   two.push_back(&test02);

libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);

libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_locale("ja_JP.eucjp", two);

libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc

@@ -28,7 +28,7 @@
 
 int main()
 {
-  using namespace __gnu_cxx_test;
+  using namespace __gnu_test;
   func_callback two;
   two.push_back(&test01);
   run_tests_wrapped_env("de_DE", "LANG", two);