summaryrefslogtreecommitdiffstats
path: root/libcxx/test
diff options
context:
space:
mode:
authorDavid Chisnall <csdavec@swan.ac.uk>2011-09-21 17:35:42 +0000
committerDavid Chisnall <csdavec@swan.ac.uk>2011-09-21 17:35:42 +0000
commitecccb1f868fccddb42e5643c024b77a2152c1ba0 (patch)
tree42429e4e437f0eca0af167678f4c2861350f511e /libcxx/test
parent1b185f4c65244c438534a421acdb895e70ac9459 (diff)
downloadbcm5719-llvm-ecccb1f868fccddb42e5643c024b77a2152c1ba0.tar.gz
bcm5719-llvm-ecccb1f868fccddb42e5643c024b77a2152c1ba0.zip
More +.UTF-8 fixes.
llvm-svn: 140262
Diffstat (limited to 'libcxx/test')
-rw-r--r--libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp4
-rw-r--r--libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp8
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp4
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp4
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp4
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp4
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp2
-rw-r--r--libcxx/test/localization/locales/locale/locale.members/name.pass.cpp4
-rw-r--r--libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp4
-rw-r--r--libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp4
20 files changed, 31 insertions, 31 deletions
diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
index a910b6ef934..0e5d581ec1b 100644
--- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
+++ b/libcxx/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");
diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp
index 7a677b36a46..0ba8d03b0ce 100644
--- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp
+++ b/libcxx/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");
diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
index ad01fe1e33f..cd94c0fca8d 100644
--- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp
index d9901ecad16..50e803313f5 100644
--- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp
+++ b/libcxx/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)
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp
index dd5f4363a97..f76232f71fc 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
index baaf76f9955..e6da3203851 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
index 963240491b4..4f3b0abf417 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp
index fc6d9fea4c4..77688198e69 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
index 1f4750732f1..a758f5146b9 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
index 9c4cf9d8663..b53a16a55da 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
index a4505b5287c..3e8908bbeef 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
index 99f2830d9da..3fbd46fcd7f 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
index 3d6c405964b..495b2020d4a 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
index 9ccc49c9963..b5a899921d7 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp
index 0f445ae0d4f..bb6c73c99c8 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp
+++ b/libcxx/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)
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp
index 5283c7e8ec9..b45971fe6f3 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp
index 630e3f5b7e2..59bf3e366d5 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp
+++ b/libcxx/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);
diff --git a/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp b/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp
index 0522a306899..3092d8acc63 100644
--- a/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp
+++ b/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp
@@ -21,7 +21,7 @@ int main()
assert(loc.name() == "C");
}
{
- std::locale loc("en_US");
- assert(loc.name() == "en_US");
+ std::locale loc("en_US.UTF-8");
+ assert(loc.name() == "en_US.UTF-8");
}
}
diff --git a/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp b/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp
index c8a5b512934..0a671cc2645 100644
--- a/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp
+++ b/libcxx/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 n2("en_US");
+ std::locale n1("en_US.UTF-8");
+ 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);
diff --git a/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp b/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp
index df4bc322108..74a4a843f4c 100644
--- a/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp
+++ b/libcxx/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"));
}
OpenPOWER on IntegriCloud