[cfe-commits] [libcxx] r140265 - in /libcxx/trunk/test/re: re.regex/re.regex.locale/imbue.pass.cpp re.traits/default.pass.cpp re.traits/getloc.pass.cpp re.traits/imbue.pass.cpp re.traits/translate_nocase.pass.cpp

[David Chisnall]

Author: theraven
Date: Wed Sep 21 12:38:03 2011
New Revision: 140265

URL: http://llvm.org/viewvc/llvm-project?rev=140265&view=rev
Log:
Fix locales used in re tests.


Modified:
    libcxx/trunk/test/re/re.regex/re.regex.locale/imbue.pass.cpp
    libcxx/trunk/test/re/re.traits/default.pass.cpp
    libcxx/trunk/test/re/re.traits/getloc.pass.cpp
    libcxx/trunk/test/re/re.traits/imbue.pass.cpp
    libcxx/trunk/test/re/re.traits/translate_nocase.pass.cpp

Modified: libcxx/trunk/test/re/re.regex/re.regex.locale/imbue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.regex/re.regex.locale/imbue.pass.cpp?rev=140265&r1=140264&r2=140265&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.regex/re.regex.locale/imbue.pass.cpp (original)
+++ libcxx/trunk/test/re/re.regex/re.regex.locale/imbue.pass.cpp Wed Sep 21 12:38:03 2011
@@ -20,10 +20,10 @@
 int main()
 {
     std::regex r;
-    std::locale loc = r.imbue(std::locale("en_US"));
+    std::locale loc = r.imbue(std::locale("en_US.UTF-8"));
     assert(loc.name() == "C");
-    assert(r.getloc().name() == "en_US");
+    assert(r.getloc().name() == "en_US.UTF-8");
     loc = r.imbue(std::locale("C"));
-    assert(loc.name() == "en_US");
+    assert(loc.name() == "en_US.UTF-8");
     assert(r.getloc().name() == "C");
 }

Modified: libcxx/trunk/test/re/re.traits/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/default.pass.cpp?rev=140265&r1=140264&r2=140265&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/default.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/default.pass.cpp Wed Sep 21 12:38:03 2011
@@ -26,10 +26,10 @@
         assert(t2.getloc().name() == "C");
     }
     {
-        std::locale::global(std::locale("en_US"));
+        std::locale::global(std::locale("en_US.UTF-8"));
         std::regex_traits<char> t1;
-        assert(t1.getloc().name() == "en_US");
+        assert(t1.getloc().name() == "en_US.UTF-8");
         std::regex_traits<wchar_t> t2;
-        assert(t2.getloc().name() == "en_US");
+        assert(t2.getloc().name() == "en_US.UTF-8");
     }
 }

Modified: libcxx/trunk/test/re/re.traits/getloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/getloc.pass.cpp?rev=140265&r1=140264&r2=140265&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/getloc.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/getloc.pass.cpp Wed Sep 21 12:38:03 2011
@@ -25,10 +25,10 @@
         assert(t2.getloc().name() == "C");
     }
     {
-        std::locale::global(std::locale("en_US"));
+        std::locale::global(std::locale("en_US.UTF-8"));
         std::regex_traits<char> t1;
-        assert(t1.getloc().name() == "en_US");
+        assert(t1.getloc().name() == "en_US.UTF-8");
         std::regex_traits<wchar_t> t2;
-        assert(t2.getloc().name() == "en_US");
+        assert(t2.getloc().name() == "en_US.UTF-8");
     }
 }

Modified: libcxx/trunk/test/re/re.traits/imbue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/imbue.pass.cpp?rev=140265&r1=140264&r2=140265&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/imbue.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/imbue.pass.cpp Wed Sep 21 12:38:03 2011
@@ -21,8 +21,8 @@
 {
     {
         std::regex_traits<char> t;
-        std::locale loc = t.imbue(std::locale("en_US"));
+        std::locale loc = t.imbue(std::locale("en_US.UTF-8"));
         assert(loc.name() == "C");
-        assert(t.getloc().name() == "en_US");
+        assert(t.getloc().name() == "en_US.UTF-8");
     }
 }

Modified: libcxx/trunk/test/re/re.traits/translate_nocase.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/translate_nocase.pass.cpp?rev=140265&r1=140264&r2=140265&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/translate_nocase.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/translate_nocase.pass.cpp Wed Sep 21 12:38:03 2011
@@ -29,7 +29,7 @@
         assert(t.translate_nocase('1') == '1');
         assert(t.translate_nocase('\xDA') == '\xDA');
         assert(t.translate_nocase('\xFA') == '\xFA');
-        t.imbue(std::locale("en_US"));
+        t.imbue(std::locale("en_US.UTF-8"));
         assert(t.translate_nocase(' ') == ' ');
         assert(t.translate_nocase('A') == 'a');
         assert(t.translate_nocase('\x07') == '\x07');
@@ -49,7 +49,7 @@
         assert(t.translate_nocase(L'1') == L'1');
         assert(t.translate_nocase(L'\xDA') == L'\xDA');
         assert(t.translate_nocase(L'\xFA') == L'\xFA');
-        t.imbue(std::locale("en_US"));
+        t.imbue(std::locale("en_US.UTF-8"));
         assert(t.translate_nocase(L' ') == L' ');
         assert(t.translate_nocase(L'A') == L'a');
         assert(t.translate_nocase(L'\x07') == L'\x07');