summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorDavid Chisnall <csdavec@swan.ac.uk>2011-09-21 17:38:03 +0000
committerDavid Chisnall <csdavec@swan.ac.uk>2011-09-21 17:38:03 +0000
commit580eccb05aa2080d5ddadf42b2c341a40e7decf9 (patch)
tree03f2968201d09b5482bf4ccac5810914f2525f33 /libcxx
parent13bddcf1bc1681c6c10cfd59f14343c5e0655bc6 (diff)
downloadbcm5719-llvm-580eccb05aa2080d5ddadf42b2c341a40e7decf9.tar.gz
bcm5719-llvm-580eccb05aa2080d5ddadf42b2c341a40e7decf9.zip
Fix locales used in re tests.
llvm-svn: 140265
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp6
-rw-r--r--libcxx/test/re/re.traits/default.pass.cpp6
-rw-r--r--libcxx/test/re/re.traits/getloc.pass.cpp6
-rw-r--r--libcxx/test/re/re.traits/imbue.pass.cpp4
-rw-r--r--libcxx/test/re/re.traits/translate_nocase.pass.cpp4
5 files changed, 13 insertions, 13 deletions
diff --git a/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp b/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp
index 58a1fdec551..13572b5cca8 100644
--- a/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp
+++ b/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp
@@ -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");
}
diff --git a/libcxx/test/re/re.traits/default.pass.cpp b/libcxx/test/re/re.traits/default.pass.cpp
index e450c24f928..f486a717db1 100644
--- a/libcxx/test/re/re.traits/default.pass.cpp
+++ b/libcxx/test/re/re.traits/default.pass.cpp
@@ -26,10 +26,10 @@ int main()
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");
}
}
diff --git a/libcxx/test/re/re.traits/getloc.pass.cpp b/libcxx/test/re/re.traits/getloc.pass.cpp
index df6d6f183e4..0bda93d56ff 100644
--- a/libcxx/test/re/re.traits/getloc.pass.cpp
+++ b/libcxx/test/re/re.traits/getloc.pass.cpp
@@ -25,10 +25,10 @@ int main()
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");
}
}
diff --git a/libcxx/test/re/re.traits/imbue.pass.cpp b/libcxx/test/re/re.traits/imbue.pass.cpp
index de1afa11374..acdabda50bb 100644
--- a/libcxx/test/re/re.traits/imbue.pass.cpp
+++ b/libcxx/test/re/re.traits/imbue.pass.cpp
@@ -21,8 +21,8 @@ int main()
{
{
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");
}
}
diff --git a/libcxx/test/re/re.traits/translate_nocase.pass.cpp b/libcxx/test/re/re.traits/translate_nocase.pass.cpp
index 1a3d91b1c91..2d02b65c4c0 100644
--- a/libcxx/test/re/re.traits/translate_nocase.pass.cpp
+++ b/libcxx/test/re/re.traits/translate_nocase.pass.cpp
@@ -29,7 +29,7 @@ int main()
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 @@ int main()
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');
OpenPOWER on IntegriCloud