2001-09-20 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/22_locale/numpunct_members_char.cc (test01): Remove
	redundant sanity checks.
	* testsuite/22_locale/money_put_members_wchar_t.cc (test01): Same.
	(test02): Same.
	* testsuite/22_locale/money_put_members_char.cc (test01): Same.
	(test02): Same.
	* testsuite/22_locale/moneypunct_members_wchar_t.cc (test01): Same.
	* testsuite/22_locale/moneypunct_members_char.cc (test01): Same.
	* testsuite/22_locale/money_get_members_wchar_t.cc (test01): Same.
	(test02): Same.
	* testsuite/22_locale/money_get_members_char.cc (test01): Same.
	(test02): Same.


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

8 files changed, 15 insertions, 121 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 762b18eb409..45145d05c66 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2001-09-20  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/22_locale/numpunct_members_char.cc (test01): Remove
+	redundant sanity checks.
+	* testsuite/22_locale/money_put_members_wchar_t.cc (test01): Same.
+	(test02): Same.
+	* testsuite/22_locale/money_put_members_char.cc (test01): Same.
+	(test02): Same.
+	* testsuite/22_locale/moneypunct_members_wchar_t.cc (test01): Same.
+	* testsuite/22_locale/moneypunct_members_char.cc (test01): Same.
+	* testsuite/22_locale/money_get_members_wchar_t.cc (test01): Same.
+	(test02): Same.
+	* testsuite/22_locale/money_get_members_char.cc (test01): Same.
+	(test02): Same.
+
 2001-09-19  Benjamin Kosnik  <bkoz@redhat.com>
 
 	Implement std::time_put.
diff --git a/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc b/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc
index a3e8ad670e9..86d59e8ea00 100644
--- a/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc
@@ -36,24 +36,13 @@ void test01()
   typedef istreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -192,24 +181,13 @@ void test02()
   typedef istreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
diff --git a/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc
index da8fdfdc06f..9426c97ef4e 100644
--- a/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc
@@ -37,24 +37,13 @@ void test01()
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -194,24 +183,13 @@ void test02()
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
diff --git a/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc b/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc
index b6bc9a9d231..c0f8d1eb243 100644
--- a/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc
@@ -36,24 +36,13 @@ void test01()
   typedef ostreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -181,24 +170,13 @@ void test02()
   typedef ostreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
diff --git a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc
index 6ff9f6fea59..b592e4f24eb 100644
--- a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc
@@ -37,24 +37,13 @@ void test01()
   typedef ostreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -181,24 +170,13 @@ void test02()
   typedef ostreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc
index cfc91649a8a..97cf3340da6 100644
--- a/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc
@@ -33,24 +33,13 @@ void test01()
   typedef money_base::pattern pattern;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_us("en_US");
-  str = loc_us.name();
-  VERIFY( loc_c != loc_us );
-
   locale loc_fr("fr_FR");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
   VERIFY( loc_de != loc_fr );
diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc
index 01b8d282111..7470a58c002 100644
--- a/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc
@@ -34,24 +34,13 @@ void test01()
   typedef money_base::pattern pattern;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_us("en_US");
-  str = loc_us.name();
-  VERIFY( loc_c != loc_us );
-
   locale loc_fr("fr_FR");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
   VERIFY( loc_de != loc_fr );
diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc b/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc
index e562f76fe81..0527c99e1cf 100644
--- a/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc
@@ -31,24 +31,13 @@ void test01()
   using namespace std;
   
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_us("en_US");
-  str = loc_us.name();
-  VERIFY( loc_c != loc_us );
-
   locale loc_fr("fr_FR");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
   VERIFY( loc_de != loc_fr );