More +.UTF-8 fixes.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@140262 91177308-0d34-0410-b5e6-96231b3b80d8

test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp

@@ -27,7 +27,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             const std::collate<char>& f = std::use_facet<std::collate<char> >(l);
             std::string s2("aaaaaaA");

test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp

@@ -21,7 +21,7 @@
 
 int main()
 {
-    std::locale l("en_US");
+    std::locale l("en_US.UTF-8");
     {
         std::string x1("1234");
         std::string x2("12345");

test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp

@@ -22,9 +22,9 @@
 int main()
 {
     // Ensure that the default locale is not C.  If it is, the second tests will fail.
-    setenv("LANG", "en_US", 1);
+    setenv("LANG", "en_US.UTF-8", 1);
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             std::string x("1234");
             const std::collate<char>& f = std::use_facet<std::collate<char> >(l);

test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp

@@ -29,7 +29,7 @@
 
 int main()
 {
-    std::locale l("en_US");
+    std::locale l("en_US.UTF-8");
     {
         assert(std::has_facet<std::collate_byname<char> >(l));
         assert(&std::use_facet<std::collate<char> >(l)

test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp

@@ -38,12 +38,12 @@ int my_facet::count = 0;
 int main()
 {
     {
-        std::locale l(std::locale::classic(), new my_facet("en_US"));
+        std::locale l(std::locale::classic(), new my_facet("en_US.UTF-8"));
         assert(my_facet::count == 1);
     }
     assert(my_facet::count == 0);
     {
-        my_facet f("en_US", 1);
+        my_facet f("en_US.UTF-8", 1);
         assert(my_facet::count == 1);
         {
             std::locale l(std::locale::classic(), &f);
@@ -53,12 +53,12 @@ int main()
     }
     assert(my_facet::count == 0);
     {
-        std::locale l(std::locale::classic(), new my_facet(std::string("en_US")));
+        std::locale l(std::locale::classic(), new my_facet(std::string("en_US.UTF-8")));
         assert(my_facet::count == 1);
     }
     assert(my_facet::count == 0);
     {
-        my_facet f(std::string("en_US"), 1);
+        my_facet f(std::string("en_US.UTF-8"), 1);
         assert(my_facet::count == 1);
         {
             std::locale l(std::locale::classic(), &f);

test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp

@@ -20,7 +20,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp

@@ -23,7 +23,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp

@@ -39,7 +39,7 @@ int main()
         }
     }
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp

@@ -23,7 +23,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp

@@ -23,7 +23,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp

@@ -19,7 +19,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<char> F;
             const F& f = std::use_facet<F>(l);
@@ -51,7 +51,7 @@ int main()
         }
     }
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp

@@ -20,7 +20,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<char> F;
             const F& f = std::use_facet<F>(l);
@@ -54,7 +54,7 @@ int main()
         }
     }
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp

@@ -19,7 +19,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<char> F;
             const F& f = std::use_facet<F>(l);
@@ -51,7 +51,7 @@ int main()
         }
     }
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp

@@ -20,7 +20,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<char> F;
             const F& f = std::use_facet<F>(l);
@@ -54,7 +54,7 @@ int main()
         }
     }
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp

@@ -28,7 +28,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             assert(std::has_facet<std::ctype_byname<char> >(l));
             assert(&std::use_facet<std::ctype<char> >(l)

test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp

@@ -22,7 +22,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp

@@ -23,7 +23,7 @@
 int main()
 {
     {
-        std::locale l("en_US");
+        std::locale l("en_US.UTF-8");
         {
             typedef std::ctype<wchar_t> F;
             const F& f = std::use_facet<F>(l);

test/localization/locales/locale/locale.members/name.pass.cpp

@@ -21,7 +21,7 @@ int main()
         assert(loc.name() == "C");
     }
     {
-        std::locale loc("en_US");
+        std::locale loc("en_US.UTF-8");
-        assert(loc.name() == "en_US");
+        assert(loc.name() == "en_US.UTF-8");
     }
 }

test/localization/locales/locale/locale.operators/eq.pass.cpp

@@ -18,8 +18,8 @@ int main()
 {
     std::locale cloc;
     std::locale copy(cloc);
-    std::locale n1("en_US");
+    std::locale n1("en_US.UTF-8");
-    std::locale n2("en_US");
+    std::locale n2("en_US.UTF-8");
     std::locale noname1 = n1.combine<std::ctype<char> >(cloc);
     std::locale nonamec = noname1;
     std::locale noname2 = n1.combine<std::ctype<char> >(cloc);

test/localization/locales/locale/locale.statics/global.pass.cpp

@@ -54,8 +54,8 @@ int main()
     std::locale loc;
     assert(loc.name() == "C");
     check(loc);
-    assert(std::locale::global(std::locale("en_US")) == loc);
+    assert(std::locale::global(std::locale("en_US.UTF-8")) == loc);
     std::locale loc2;
     check(loc2);
-    assert(loc2 == std::locale("en_US"));
+    assert(loc2 == std::locale("en_US.UTF-8"));
 }