3.cc: Split.

2003-04-11  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/22_locale/locale/cons/3.cc: Split.
	* testsuite/22_locale/locale/cons/7222-c.cc: New.
	* testsuite/22_locale/locale/cons/7222-env.cc: New.
	Check before trying to create a locale from the environment.
	* testsuite/27_io/ios_base/state/1.cc (test02): Use "C" locale.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc:
	Adjust includes.

From-SVN: r65475

5 files changed, 55 insertions, 10 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 577de69..ff6af69 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,15 @@
 2003-04-11  Benjamin Kosnik  <bkoz@redhat.com>
 
+	* testsuite/22_locale/locale/cons/3.cc: Split.
+	* testsuite/22_locale/locale/cons/7222-c.cc: New.
+	* testsuite/22_locale/locale/cons/7222-env.cc: New.	
+	Check before trying to create a locale from the environment.
+	* testsuite/27_io/ios_base/state/1.cc (test02): Use "C" locale.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc:
+	Adjust includes.
+	
+2003-04-11  Benjamin Kosnik  <bkoz@redhat.com>
+
 	* testsuite/22_locale/ctype/is/char/3.cc (test03): Use the classic
 	locale to construct this hybrid locale, not the global locale.
 
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/3.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/7222-c.cc
index 7cc9126..7a93dee 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/7222-c.cc
@@ -29,14 +29,10 @@
 void test02()
 {
   bool test = true;
+
   std::locale loc_c1("C");
   std::locale loc_c2 ("C");
-  
-  std::locale loc_1("");
-  std::locale loc_2("");
-
   VERIFY( loc_c1 == loc_c2 );
-  VERIFY( loc_1 == loc_2 );
 }
  
 int main()
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc
new file mode 100644
index 0000000..1309a31
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc
@@ -0,0 +1,42 @@
+// 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
+
+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+//
+// 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.
+
+// 22.1.1.2 locale constructors and destructors [lib.locale.cons]
+
+#include <cwchar> // for mbstate_t
+#include <locale>
+#include <stdexcept>
+#include <testsuite_hooks.h>
+
+// libstdc++/7222
+void test02()
+{
+  bool test = true;
+
+  std::locale loc_1("");
+  std::locale loc_2("");
+  VERIFY( loc_1 == loc_2 );
+}
+ 
+int main()
+{
+  __gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02);
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc
index 64795c0..4d7a7fe 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc
@@ -25,11 +25,8 @@
 // XXX http://gcc.gnu.org/ml/gcc/2002-12/msg01422.html
 // { dg-do run { xfail sparc*-*-solaris2* } }
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
-#include <locale>
 #include <testsuite_hooks.h>
 
 std::string str_01;
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc
index 6097fdb..bc6a356 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc
@@ -39,9 +39,9 @@ test02()
   std::string str01;
   std::string str02;
 
-  std::locale loc("");
+  std::locale loc_c = std::locale::classic();
   std::ostringstream ostr01;
-  ostr01.imbue(loc);
+  ostr01.imbue(loc_c);
   std::ios_base::fmtflags ff = ostr01.flags(std::ios_base::boolalpha);
 
   ostr01 << true;