[cfe-commits] [libcxx] r140251 - in /libcxx/trunk/test/input.output/stream.buffers/streambuf: streambuf.cons/copy.pass.cpp streambuf.cons/default.pass.cpp streambuf.members/streambuf.locales/locales.pass.cpp streambuf.protected/streambuf.assign/assign.pass.cpp streambuf.protected/streambuf.assign/swap.pass.cpp

David Chisnall csdavec at swan.ac.uk
Wed Sep 21 07:48:49 PDT 2011


Author: theraven
Date: Wed Sep 21 09:48:49 2011
New Revision: 140251

URL: http://llvm.org/viewvc/llvm-project?rev=140251&view=rev
Log:
Fully-qualify some more locales in the tests...


Modified:
    libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp
    libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp
    libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp
    libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp
    libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp

Modified: libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp?rev=140251&r1=140250&r2=140251&view=diff
==============================================================================
--- libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp Wed Sep 21 09:48:49 2011
@@ -70,7 +70,7 @@
         t.setp(&p1, &p3);
         test<wchar_t> t2 = t;
     }
-    std::locale::global(std::locale("en_US"));
+    std::locale::global(std::locale("en_US.UTF-8"));
     {
         test<char> t;
         test<char> t2 = t;

Modified: libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp?rev=140251&r1=140250&r2=140251&view=diff
==============================================================================
--- libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp (original)
+++ libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp Wed Sep 21 09:48:49 2011
@@ -42,13 +42,13 @@
         test<wchar_t> t;
         assert(t.getloc().name() == "C");
     }
-    std::locale::global(std::locale("en_US"));
+    std::locale::global(std::locale("en_US.UTF-8"));
     {
         test<char> t;
-        assert(t.getloc().name() == "en_US");
+        assert(t.getloc().name() == "en_US.UTF-8");
     }
     {
         test<wchar_t> t;
-        assert(t.getloc().name() == "en_US");
+        assert(t.getloc().name() == "en_US.UTF-8");
     }
 }

Modified: libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp?rev=140251&r1=140250&r2=140251&view=diff
==============================================================================
--- libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp (original)
+++ libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp Wed Sep 21 09:48:49 2011
@@ -26,7 +26,7 @@
 
     void imbue(const std::locale&)
     {
-        assert(this->getloc().name() == "en_US");
+        assert(this->getloc().name() == "en_US.UTF-8");
     }
 };
 
@@ -36,11 +36,11 @@
         test<char> t;
         assert(t.getloc().name() == "C");
     }
-    std::locale::global(std::locale("en_US"));
+    std::locale::global(std::locale("en_US.UTF-8"));
     {
         test<char> t;
-        assert(t.getloc().name() == "en_US");
-        assert(t.pubimbue(std::locale("fr_FR")).name() == "en_US");
-        assert(t.getloc().name() == "fr_FR");
+        assert(t.getloc().name() == "en_US.UTF-8");
+        assert(t.pubimbue(std::locale("fr_FR.UTF-8")).name() == "en_US.UTF-8");
+        assert(t.getloc().name() == "fr_FR.UTF-8");
     }
 }

Modified: libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp?rev=140251&r1=140250&r2=140251&view=diff
==============================================================================
--- libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp (original)
+++ libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp Wed Sep 21 09:48:49 2011
@@ -75,7 +75,7 @@
         test<wchar_t> t2;
         t2 = t;
     }
-    std::locale::global(std::locale("en_US"));
+    std::locale::global(std::locale("en_US.UTF-8"));
     {
         test<char> t;
         test<char> t2;

Modified: libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp?rev=140251&r1=140250&r2=140251&view=diff
==============================================================================
--- libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp (original)
+++ libcxx/trunk/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp Wed Sep 21 09:48:49 2011
@@ -85,7 +85,7 @@
         test<wchar_t> t2;
         swap(t2, t);
     }
-    std::locale::global(std::locale("en_US"));
+    std::locale::global(std::locale("en_US.UTF-8"));
     {
         test<char> t;
         test<char> t2;





More information about the cfe-commits mailing list