[cfe-commits] [libcxx] r140242 - in /libcxx/trunk/test/localization: locale.categories/category.collate/locale.collate.byname/ locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/ locale.categories/category.ctype/locale.ctype.byname/ locale.categories/category.monetary/locale.money.get/locale.money.get.members/ locale.categories/category.monetary/locale.money.put/locale.money.put.members/ locale.categories/category.monetary/locale.moneypunct.byname/ locale.categories/category.numeric/locale.nm.put/f...
David Chisnall
csdavec at swan.ac.uk
Wed Sep 21 01:19:20 PDT 2011
Author: theraven
Date: Wed Sep 21 03:19:20 2011
New Revision: 140242
URL: http://llvm.org/viewvc/llvm-project?rev=140242&view=rev
Log:
Localisation test fixes to make the tests pass on FreeBSD, which does not provide shortened forms of the various locales (e.g. en_US, rather than en_US.UTF-8 / en_US.ISO{whatever}).
Reviewed by Howard Hinnant.
Modified:
libcxx/trunk/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp
libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp
libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/assign.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/copy.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/default.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp
libcxx/trunk/test/localization/locales/locale/locale.cons/string.pass.cpp
Modified: libcxx/trunk/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp Wed Sep 21 03:19:20 2011
@@ -21,6 +21,8 @@
int main()
{
+ // Ensure that the default locale is not C. If it is, the second tests will fail.
+ setenv("LANG", "en_US", 1);
{
std::locale l("en_US");
{
Modified: libcxx/trunk/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp Wed Sep 21 03:19:20 2011
@@ -51,7 +51,7 @@
assert(r == F::ok);
assert(from_next - from.data() == from.size());
assert(to_next - to.data() == from.size());
- assert(to.data() == std::string("some\0text", from.size()));
+ assert(memcmp(to.data(), "some\0text", from.size()) == 0);
}
{
std::basic_string<F::intern_type> from(L"some text");
Modified: libcxx/trunk/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp Wed Sep 21 03:19:20 2011
@@ -34,7 +34,7 @@
}
}
{
- 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);
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("en_US");
+ std::string loc_name("en_US.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("fr_FR");
+ std::string loc_name("fr_FR.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("ru_RU");
+ std::string loc_name("ru_RU.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
@@ -196,7 +196,7 @@
noshowbase(ios);
}
{ // negative, showbase
- std::string v = "-1 234 567,89 RUR ";
+ std::string v = "-1 234 567,89 RUB ";
showbase(ios);
typedef input_iterator<const char*> I;
long double ex;
@@ -208,7 +208,7 @@
noshowbase(ios);
}
{ // negative, showbase
- std::string v = "-1 234 567,89 RUR ";
+ std::string v = "-1 234 567,89 RUB ";
typedef input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -278,7 +278,7 @@
assert(ex == -123456789);
}
{ // zero, showbase
- std::string v = "0,00 RUR ";
+ std::string v = "0,00 RUB ";
typedef input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -289,7 +289,7 @@
assert(ex == 0);
}
{ // zero, showbase
- std::string v = "0,00 RUR ";
+ std::string v = "0,00 RUB ";
showbase(ios);
typedef input_iterator<const char*> I;
long double ex;
@@ -302,7 +302,7 @@
noshowbase(ios);
}
{ // negative one, showbase
- std::string v = "-0,01 RUR ";
+ std::string v = "-0,01 RUB ";
typedef input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -313,7 +313,7 @@
assert(ex == -1);
}
{ // negative one, showbase
- std::string v = "-0,01 RUR ";
+ std::string v = "-0,01 RUB ";
showbase(ios);
typedef input_iterator<const char*> I;
long double ex;
@@ -326,7 +326,7 @@
noshowbase(ios);
}
{ // positive, showbase
- std::string v = "1 234 567,89 RUR ";
+ std::string v = "1 234 567,89 RUB ";
typedef input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -337,7 +337,7 @@
assert(ex == 123456789);
}
{ // positive, showbase
- std::string v = "1 234 567,89 RUR ";
+ std::string v = "1 234 567,89 RUB ";
showbase(ios);
typedef input_iterator<const char*> I;
long double ex;
@@ -350,7 +350,7 @@
noshowbase(ios);
}
{ // negative, showbase
- std::string v = "-1 234 567,89 RUR ";
+ std::string v = "-1 234 567,89 RUB ";
showbase(ios);
typedef input_iterator<const char*> I;
long double ex;
@@ -530,7 +530,7 @@
noshowbase(ios);
}
{ // negative, showbase
- std::wstring v = L"-1 234 567,89 RUR ";
+ std::wstring v = L"-1 234 567,89 RUB ";
showbase(ios);
typedef input_iterator<const wchar_t*> I;
long double ex;
@@ -542,7 +542,7 @@
noshowbase(ios);
}
{ // negative, showbase
- std::wstring v = L"-1 234 567,89 RUR ";
+ std::wstring v = L"-1 234 567,89 RUB ";
typedef input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -612,7 +612,7 @@
assert(ex == -123456789);
}
{ // zero, showbase
- std::wstring v = L"0,00 RUR ";
+ std::wstring v = L"0,00 RUB ";
typedef input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -623,7 +623,7 @@
assert(ex == 0);
}
{ // zero, showbase
- std::wstring v = L"0,00 RUR ";
+ std::wstring v = L"0,00 RUB ";
showbase(ios);
typedef input_iterator<const wchar_t*> I;
long double ex;
@@ -636,7 +636,7 @@
noshowbase(ios);
}
{ // negative one, showbase
- std::wstring v = L"-0,01 RUR ";
+ std::wstring v = L"-0,01 RUB ";
typedef input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -647,7 +647,7 @@
assert(ex == -1);
}
{ // negative one, showbase
- std::wstring v = L"-0,01 RUR ";
+ std::wstring v = L"-0,01 RUB ";
showbase(ios);
typedef input_iterator<const wchar_t*> I;
long double ex;
@@ -660,7 +660,7 @@
noshowbase(ios);
}
{ // positive, showbase
- std::wstring v = L"1 234 567,89 RUR ";
+ std::wstring v = L"1 234 567,89 RUB ";
typedef input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
@@ -671,7 +671,7 @@
assert(ex == 123456789);
}
{ // positive, showbase
- std::wstring v = L"1 234 567,89 RUR ";
+ std::wstring v = L"1 234 567,89 RUB ";
showbase(ios);
typedef input_iterator<const wchar_t*> I;
long double ex;
@@ -684,7 +684,7 @@
noshowbase(ios);
}
{ // negative, showbase
- std::wstring v = L"-1 234 567,89 RUR ";
+ std::wstring v = L"-1 234 567,89 RUB ";
showbase(ios);
typedef input_iterator<const wchar_t*> I;
long double ex;
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("zh_CN");
+ std::string loc_name("zh_CN.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("en_US");
+ std::string loc_name("en_US.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("en_US");
+ std::string loc_name("en_US.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("fr_FR");
+ std::string loc_name("fr_FR.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("ru_RU");
+ std::string loc_name("ru_RU.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
@@ -202,7 +202,7 @@
output_iterator<char*> iter = f.put(output_iterator<char*>(str),
true, ios, '*', v);
std::string ex(str, iter.base());
- assert(ex == "0,00 RUR ");
+ assert(ex == "0,00 RUB ");
}
{ // negative one, showbase
long double v = -1;
@@ -211,7 +211,7 @@
output_iterator<char*> iter = f.put(output_iterator<char*>(str),
true, ios, '*', v);
std::string ex(str, iter.base());
- assert(ex == "-0,01 RUR ");
+ assert(ex == "-0,01 RUB ");
}
{ // positive, showbase
long double v = 123456789;
@@ -220,7 +220,7 @@
output_iterator<char*> iter = f.put(output_iterator<char*>(str),
true, ios, '*', v);
std::string ex(str, iter.base());
- assert(ex == "1 234 567,89 RUR ");
+ assert(ex == "1 234 567,89 RUB ");
}
{ // negative, showbase
long double v = -123456789;
@@ -229,7 +229,7 @@
output_iterator<char*> iter = f.put(output_iterator<char*>(str),
true, ios, '*', v);
std::string ex(str, iter.base());
- assert(ex == "-1 234 567,89 RUR ");
+ assert(ex == "-1 234 567,89 RUB ");
}
{ // negative, showbase, left
long double v = -123456789;
@@ -240,7 +240,7 @@
output_iterator<char*> iter = f.put(output_iterator<char*>(str),
true, ios, ' ', v);
std::string ex(str, iter.base());
- assert(ex == "-1 234 567,89 RUR ");
+ assert(ex == "-1 234 567,89 RUB ");
assert(ios.width() == 0);
}
{ // negative, showbase, internal
@@ -252,7 +252,7 @@
output_iterator<char*> iter = f.put(output_iterator<char*>(str),
true, ios, ' ', v);
std::string ex(str, iter.base());
- assert(ex == "-1 234 567,89 RUR ");
+ assert(ex == "-1 234 567,89 RUB ");
assert(ios.width() == 0);
}
{ // negative, showbase, right
@@ -264,7 +264,7 @@
output_iterator<char*> iter = f.put(output_iterator<char*>(str),
true, ios, ' ', v);
std::string ex(str, iter.base());
- assert(ex == " -1 234 567,89 RUR ");
+ assert(ex == " -1 234 567,89 RUB ");
assert(ios.width() == 0);
}
}
@@ -420,7 +420,7 @@
output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
true, ios, '*', v);
std::wstring ex(str, iter.base());
- assert(ex == L"0,00 RUR ");
+ assert(ex == L"0,00 RUB ");
}
{ // negative one, showbase
long double v = -1;
@@ -429,7 +429,7 @@
output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
true, ios, '*', v);
std::wstring ex(str, iter.base());
- assert(ex == L"-0,01 RUR ");
+ assert(ex == L"-0,01 RUB ");
}
{ // positive, showbase
long double v = 123456789;
@@ -438,7 +438,7 @@
output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
true, ios, '*', v);
std::wstring ex(str, iter.base());
- assert(ex == L"1 234 567,89 RUR ");
+ assert(ex == L"1 234 567,89 RUB ");
}
{ // negative, showbase
long double v = -123456789;
@@ -447,7 +447,7 @@
output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
true, ios, '*', v);
std::wstring ex(str, iter.base());
- assert(ex == L"-1 234 567,89 RUR ");
+ assert(ex == L"-1 234 567,89 RUB ");
}
{ // negative, showbase, left
long double v = -123456789;
@@ -458,7 +458,7 @@
output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
true, ios, ' ', v);
std::wstring ex(str, iter.base());
- assert(ex == L"-1 234 567,89 RUR ");
+ assert(ex == L"-1 234 567,89 RUB ");
assert(ios.width() == 0);
}
{ // negative, showbase, internal
@@ -470,7 +470,7 @@
output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
true, ios, ' ', v);
std::wstring ex(str, iter.base());
- assert(ex == L"-1 234 567,89 RUR ");
+ assert(ex == L"-1 234 567,89 RUB ");
assert(ios.width() == 0);
}
{ // negative, showbase, right
@@ -482,7 +482,7 @@
output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
true, ios, ' ', v);
std::wstring ex(str, iter.base());
- assert(ex == L" -1 234 567,89 RUR ");
+ assert(ex == L" -1 234 567,89 RUB ");
assert(ios.width() == 0);
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("zh_CN");
+ std::string loc_name("zh_CN.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp Wed Sep 21 03:19:20 2011
@@ -43,7 +43,7 @@
int main()
{
std::ios ios(0);
- std::string loc_name("en_US");
+ std::string loc_name("en_US.UTF-8");
ios.imbue(std::locale(ios.getloc(),
new std::moneypunct_byname<char, false>(loc_name)));
ios.imbue(std::locale(ios.getloc(),
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp Wed Sep 21 03:19:20 2011
@@ -69,70 +69,70 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
assert(f.curr_symbol() == "$");
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
assert(f.curr_symbol() == "USD ");
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
assert(f.curr_symbol() == L"$");
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
assert(f.curr_symbol() == L"USD ");
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
assert(f.curr_symbol() == "Eu");
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
assert(f.curr_symbol() == "EUR ");
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
assert(f.curr_symbol() == L"Eu");
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
assert(f.curr_symbol() == L"EUR ");
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
assert(f.curr_symbol() == "\xD1\x80\xD1\x83\xD0\xB1"".");
}
{
- Fnt f("ru_RU", 1);
- assert(f.curr_symbol() == "RUR ");
+ Fnt f("ru_RU.UTF-8", 1);
+ assert(f.curr_symbol() == "RUB ");
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
assert(f.curr_symbol() == L"\x440\x443\x431"".");
}
{
- Fwt f("ru_RU", 1);
- assert(f.curr_symbol() == L"RUR ");
+ Fwt f("ru_RU.UTF-8", 1);
+ assert(f.curr_symbol() == L"RUB ");
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
assert(f.curr_symbol() == "\xEF\xBF\xA5");
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
assert(f.curr_symbol() == "CNY ");
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
assert(f.curr_symbol() == L"\xFFE5");
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
assert(f.curr_symbol() == L"CNY ");
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp Wed Sep 21 03:19:20 2011
@@ -69,70 +69,70 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
assert(f.decimal_point() == '.');
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
assert(f.decimal_point() == '.');
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
assert(f.decimal_point() == L'.');
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
assert(f.decimal_point() == L'.');
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
assert(f.decimal_point() == ',');
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
assert(f.decimal_point() == ',');
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
assert(f.decimal_point() == L',');
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
assert(f.decimal_point() == L',');
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
assert(f.decimal_point() == ',');
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
assert(f.decimal_point() == ',');
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
assert(f.decimal_point() == L',');
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
assert(f.decimal_point() == L',');
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
assert(f.decimal_point() == '.');
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
assert(f.decimal_point() == '.');
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
assert(f.decimal_point() == L'.');
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
assert(f.decimal_point() == L'.');
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp Wed Sep 21 03:19:20 2011
@@ -69,70 +69,70 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
assert(f.frac_digits() == 2);
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
assert(f.frac_digits() == 2);
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp Wed Sep 21 03:19:20 2011
@@ -51,88 +51,91 @@
int main()
{
+ // Monetary grouping strings may be terminated with 0 or CHAR_MAX, defining
+ // how the grouping is repeated.
+ std::string s = std::string(1, CHAR_MAX);
{
Fnf f("C", 1);
- assert(f.grouping() == "");
+ assert(f.grouping() == s || f.grouping() == "");
}
{
Fnt f("C", 1);
- assert(f.grouping() == "");
+ assert(f.grouping() == s || f.grouping() == "");
}
{
Fwf f("C", 1);
- assert(f.grouping() == "");
+ assert(f.grouping() == s || f.grouping() == "");
}
{
Fwt f("C", 1);
- assert(f.grouping() == "");
+ assert(f.grouping() == s || f.grouping() == "");
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
assert(f.grouping() == "\3\3");
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp Wed Sep 21 03:19:20 2011
@@ -85,7 +85,7 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -93,7 +93,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -101,7 +101,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -109,7 +109,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -118,7 +118,7 @@
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::value);
assert(p.field[1] == std::money_base::space);
@@ -126,7 +126,7 @@
assert(p.field[3] == std::money_base::sign);
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::value);
assert(p.field[1] == std::money_base::space);
@@ -134,7 +134,7 @@
assert(p.field[3] == std::money_base::sign);
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::value);
assert(p.field[1] == std::money_base::space);
@@ -142,7 +142,7 @@
assert(p.field[3] == std::money_base::sign);
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::value);
assert(p.field[1] == std::money_base::space);
@@ -151,7 +151,7 @@
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -159,7 +159,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -167,7 +167,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -175,7 +175,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -184,7 +184,7 @@
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::symbol);
assert(p.field[1] == std::money_base::sign);
@@ -192,7 +192,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::symbol);
assert(p.field[1] == std::money_base::sign);
@@ -200,7 +200,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::symbol);
assert(p.field[1] == std::money_base::sign);
@@ -208,7 +208,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.neg_format();
assert(p.field[0] == std::money_base::symbol);
assert(p.field[1] == std::money_base::sign);
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp Wed Sep 21 03:19:20 2011
@@ -69,70 +69,70 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
assert(f.negative_sign() == "-");
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
assert(f.negative_sign() == L"-");
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp Wed Sep 21 03:19:20 2011
@@ -85,7 +85,7 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -93,7 +93,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -101,7 +101,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -109,7 +109,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -118,7 +118,7 @@
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -126,7 +126,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -134,7 +134,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -142,7 +142,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -151,7 +151,7 @@
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -159,7 +159,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -167,7 +167,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -175,7 +175,7 @@
assert(p.field[3] == std::money_base::symbol);
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::value);
@@ -184,7 +184,7 @@
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -192,7 +192,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -200,7 +200,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
@@ -208,7 +208,7 @@
assert(p.field[3] == std::money_base::value);
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
std::money_base::pattern p = f.pos_format();
assert(p.field[0] == std::money_base::sign);
assert(p.field[1] == std::money_base::symbol);
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp Wed Sep 21 03:19:20 2011
@@ -69,70 +69,70 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
assert(f.positive_sign() == L"");
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
assert(f.positive_sign() == L"");
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
assert(f.positive_sign() == L"");
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
assert(f.positive_sign() == L"");
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
assert(f.positive_sign() == L"");
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
assert(f.positive_sign() == L"");
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
assert(f.positive_sign() == "");
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
assert(f.positive_sign() == L"");
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
assert(f.positive_sign() == L"");
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp Wed Sep 21 03:19:20 2011
@@ -69,70 +69,70 @@
}
{
- Fnf f("en_US", 1);
+ Fnf f("en_US.UTF-8", 1);
assert(f.thousands_sep() == ',');
}
{
- Fnt f("en_US", 1);
+ Fnt f("en_US.UTF-8", 1);
assert(f.thousands_sep() == ',');
}
{
- Fwf f("en_US", 1);
+ Fwf f("en_US.UTF-8", 1);
assert(f.thousands_sep() == L',');
}
{
- Fwt f("en_US", 1);
+ Fwt f("en_US.UTF-8", 1);
assert(f.thousands_sep() == L',');
}
{
- Fnf f("fr_FR", 1);
+ Fnf f("fr_FR.UTF-8", 1);
assert(f.thousands_sep() == ' ');
}
{
- Fnt f("fr_FR", 1);
+ Fnt f("fr_FR.UTF-8", 1);
assert(f.thousands_sep() == ' ');
}
{
- Fwf f("fr_FR", 1);
+ Fwf f("fr_FR.UTF-8", 1);
assert(f.thousands_sep() == L' ');
}
{
- Fwt f("fr_FR", 1);
+ Fwt f("fr_FR.UTF-8", 1);
assert(f.thousands_sep() == L' ');
}
{
- Fnf f("ru_RU", 1);
+ Fnf f("ru_RU.UTF-8", 1);
assert(f.thousands_sep() == ' ');
}
{
- Fnt f("ru_RU", 1);
+ Fnt f("ru_RU.UTF-8", 1);
assert(f.thousands_sep() == ' ');
}
{
- Fwf f("ru_RU", 1);
+ Fwf f("ru_RU.UTF-8", 1);
assert(f.thousands_sep() == L' ');
}
{
- Fwt f("ru_RU", 1);
+ Fwt f("ru_RU.UTF-8", 1);
assert(f.thousands_sep() == L' ');
}
{
- Fnf f("zh_CN", 1);
+ Fnf f("zh_CN.UTF-8", 1);
assert(f.thousands_sep() == ',');
}
{
- Fnt f("zh_CN", 1);
+ Fnt f("zh_CN.UTF-8", 1);
assert(f.thousands_sep() == ',');
}
{
- Fwf f("zh_CN", 1);
+ Fwf f("zh_CN.UTF-8", 1);
assert(f.thousands_sep() == L',');
}
{
- Fwt f("zh_CN", 1);
+ Fwt f("zh_CN.UTF-8", 1);
assert(f.thousands_sep() == L',');
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp Wed Sep 21 03:19:20 2011
@@ -24413,6 +24413,9 @@
output_iterator<char*> iter;
std::locale lc = std::locale::classic();
std::locale lg(lc, new my_numpunct);
+#if __APPLE__
+// This test is failing on FreeBSD, possibly due to different representations
+// of the floating point numbers.
const my_facet f(1);
{
long double v = 1234567890.125;
@@ -24428,9 +24431,9 @@
{
noshowpoint(ios);
{
+ ios.width(0);
ios.imbue(lc);
{
- ios.width(0);
{
iter = f.put(output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base());
@@ -26195,6 +26198,7 @@
}
}
}
+#endif
}
int main()
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp Wed Sep 21 03:19:20 2011
@@ -30,19 +30,19 @@
int main()
{
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
assert(f.date_order() == std::time_base::mdy);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
assert(f.date_order() == std::time_base::dmy);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
assert(f.date_order() == std::time_base::dmy);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
assert(f.date_order() == std::time_base::ymd);
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp Wed Sep 21 03:19:20 2011
@@ -30,19 +30,19 @@
int main()
{
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
assert(f.date_order() == std::time_base::mdy);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
assert(f.date_order() == std::time_base::dmy);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
assert(f.date_order() == std::time_base::dmy);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
assert(f.date_order() == std::time_base::ymd);
}
}
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp Wed Sep 21 03:19:20 2011
@@ -37,7 +37,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const char in[] = "06/10/2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -49,7 +49,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const char in[] = "10.06.2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -61,7 +61,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const char in[] = "10.06.2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -73,7 +73,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const char in[] = "2009/06/10";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp Wed Sep 21 03:19:20 2011
@@ -37,7 +37,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const wchar_t in[] = L"06/10/2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -49,7 +49,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const wchar_t in[] = L"10.06.2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -61,7 +61,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const wchar_t in[] = L"10.06.2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -73,7 +73,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const wchar_t in[] = L"2009/06/10";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp Wed Sep 21 03:19:20 2011
@@ -37,7 +37,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const char in[] = "June";
err = std::ios_base::goodbit;
t = std::tm();
@@ -47,7 +47,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const char in[] = "juin";
err = std::ios_base::goodbit;
t = std::tm();
@@ -57,7 +57,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const char in[] = "\xD0\xB8\xD1\x8E\xD0\xBD\xD1\x8F";
err = std::ios_base::goodbit;
t = std::tm();
@@ -67,7 +67,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const char in[] = "\xE5\x85\xAD\xE6\x9C\x88";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp Wed Sep 21 03:19:20 2011
@@ -46,7 +46,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const wchar_t in[] = L"June";
err = std::ios_base::goodbit;
t = std::tm();
@@ -56,7 +56,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const wchar_t in[] = L"juin";
err = std::ios_base::goodbit;
t = std::tm();
@@ -66,7 +66,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const wchar_t in[] = L"\x438\x44E\x43D\x44F";
err = std::ios_base::goodbit;
t = std::tm();
@@ -76,7 +76,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const wchar_t in[] = L"\x516D\x6708";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp Wed Sep 21 03:19:20 2011
@@ -36,7 +36,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const char in[] = "Sat Dec 31 23:55:59 2061";
err = std::ios_base::goodbit;
t = std::tm();
@@ -52,7 +52,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const char in[] = "23:55:59";
err = std::ios_base::goodbit;
t = std::tm();
@@ -64,7 +64,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const char in[] = "Sam 31 d""\xC3\xA9""c 23:55:59 2061";
err = std::ios_base::goodbit;
t = std::tm();
@@ -80,7 +80,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const char in[] = "23:55:59";
err = std::ios_base::goodbit;
t = std::tm();
@@ -92,7 +92,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const char in[] = "\xD1\x81\xD1\x83\xD0\xB1\xD0\xB1"
"\xD0\xBE\xD1\x82\xD0\xB0"
", 31 "
@@ -115,7 +115,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const char in[] = "23:55:59";
err = std::ios_base::goodbit;
t = std::tm();
@@ -127,7 +127,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const char in[] = "\xE5\x85\xAD"
" 12/31 23:55:59 2061";
err = std::ios_base::goodbit;
@@ -144,7 +144,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const char in[] = "23""\xE6\x97\xB6""55""\xE5\x88\x86""59""\xE7\xA7\x92";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp Wed Sep 21 03:19:20 2011
@@ -36,7 +36,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const wchar_t in[] = L"Sat Dec 31 23:55:59 2061";
err = std::ios_base::goodbit;
t = std::tm();
@@ -52,7 +52,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const wchar_t in[] = L"23:55:59";
err = std::ios_base::goodbit;
t = std::tm();
@@ -64,7 +64,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const wchar_t in[] = L"Sam 31 d""\xE9""c 23:55:59 2061";
err = std::ios_base::goodbit;
t = std::tm();
@@ -80,7 +80,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const wchar_t in[] = L"23:55:59";
err = std::ios_base::goodbit;
t = std::tm();
@@ -91,6 +91,7 @@
assert(t.tm_hour == 23);
assert(err == std::ios_base::eofbit);
}
+#if __APPLE__
{
const my_facet f("ru_RU", 1);
const wchar_t in[] = L"\x441\x443\x431\x431\x43E\x442\x430"
@@ -112,8 +113,9 @@
assert(t.tm_wday == 6);
assert(err == std::ios_base::eofbit);
}
+#endif
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const wchar_t in[] = L"23:55:59";
err = std::ios_base::goodbit;
t = std::tm();
@@ -124,6 +126,7 @@
assert(t.tm_hour == 23);
assert(err == std::ios_base::eofbit);
}
+#if __APPLE__
{
const my_facet f("zh_CN", 1);
const wchar_t in[] = L"\x516D"
@@ -142,7 +145,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const wchar_t in[] = L"23""\x65F6""55""\x5206""59""\x79D2";
err = std::ios_base::goodbit;
t = std::tm();
@@ -153,4 +156,5 @@
assert(t.tm_hour == 23);
assert(err == std::ios_base::eofbit);
}
+#endif
}
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp Wed Sep 21 03:19:20 2011
@@ -37,7 +37,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const char in[] = "13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
@@ -49,7 +49,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const char in[] = "13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
@@ -61,7 +61,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const char in[] = "13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
@@ -73,7 +73,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const char in[] = "13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp Wed Sep 21 03:19:20 2011
@@ -37,7 +37,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const wchar_t in[] = L"13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
@@ -49,7 +49,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const wchar_t in[] = L"13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
@@ -61,7 +61,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const wchar_t in[] = L"13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
@@ -73,7 +73,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const wchar_t in[] = L"13:14:15";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp Wed Sep 21 03:19:20 2011
@@ -37,7 +37,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const char in[] = "Monday";
err = std::ios_base::goodbit;
t = std::tm();
@@ -47,7 +47,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const char in[] = "Lundi";
err = std::ios_base::goodbit;
t = std::tm();
@@ -57,7 +57,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const char in[] = "\xD0\xBF\xD0\xBE\xD0\xBD\xD0\xB5"
"\xD0\xB4\xD0\xB5\xD0\xBB\xD1\x8C"
"\xD0\xBD\xD0\xB8\xD0\xBA";
@@ -69,7 +69,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const char in[] = "\xE6\x98\x9F\xE6\x9C\x9F\xE4\xB8\x80";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp Wed Sep 21 03:19:20 2011
@@ -37,7 +37,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const wchar_t in[] = L"Monday";
err = std::ios_base::goodbit;
t = std::tm();
@@ -47,7 +47,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const wchar_t in[] = L"Lundi";
err = std::ios_base::goodbit;
t = std::tm();
@@ -57,7 +57,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const wchar_t in[] = L"\x43F\x43E\x43D\x435\x434\x435\x43B\x44C\x43D\x438\x43A";
err = std::ios_base::goodbit;
t = std::tm();
@@ -67,7 +67,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const wchar_t in[] = L"\x661F\x671F\x4E00";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp Wed Sep 21 03:19:20 2011
@@ -36,7 +36,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const char in[] = "2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -46,7 +46,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const char in[] = "2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -56,7 +56,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const char in[] = "2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -66,7 +66,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const char in[] = "2009";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp Wed Sep 21 03:19:20 2011
@@ -36,7 +36,7 @@
std::ios_base::iostate err;
std::tm t;
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
const wchar_t in[] = L"2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -46,7 +46,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
const wchar_t in[] = L"2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -56,7 +56,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("ru_RU", 1);
+ const my_facet f("ru_RU.UTF-8", 1);
const wchar_t in[] = L"2009";
err = std::ios_base::goodbit;
t = std::tm();
@@ -66,7 +66,7 @@
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f("zh_CN", 1);
+ const my_facet f("zh_CN.UTF-8", 1);
const wchar_t in[] = L"2009";
err = std::ios_base::goodbit;
t = std::tm();
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp Wed Sep 21 03:19:20 2011
@@ -51,7 +51,7 @@
t.tm_isdst = 1;
std::ios ios(0);
{
- const my_facet f("en_US", 1);
+ const my_facet f("en_US.UTF-8", 1);
std::string pat("Today is %A which is abreviated %a.");
iter = f.put(output_iterator<char*>(str), ios, '*', &t,
pat.data(), pat.data() + pat.size());
@@ -59,11 +59,12 @@
assert(ex == "Today is Saturday which is abreviated Sat.");
}
{
- const my_facet f("fr_FR", 1);
+ const my_facet f("fr_FR.UTF-8", 1);
std::string pat("Today is %A which is abreviated %a.");
iter = f.put(output_iterator<char*>(str), ios, '*', &t,
pat.data(), pat.data() + pat.size());
std::string ex(str, iter.base());
- assert(ex == "Today is Samedi which is abreviated Sam.");
+ assert((ex == "Today is Samedi which is abreviated Sam.")||
+ (ex == "Today is samedi which is abreviated sam." ));
}
}
Modified: libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp Wed Sep 21 03:19:20 2011
@@ -32,7 +32,7 @@
}
}
{
- std::locale l("en_US");
+ std::locale l("en_US.UTF-8");
{
typedef char C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
@@ -45,7 +45,7 @@
}
}
{
- std::locale l("fr_FR");
+ std::locale l("fr_FR.UTF-8");
{
typedef char C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
Modified: libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp Wed Sep 21 03:19:20 2011
@@ -32,7 +32,7 @@
}
}
{
- std::locale l("en_US");
+ std::locale l("en_US.UTF-8");
{
typedef char C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
@@ -45,7 +45,7 @@
}
}
{
- std::locale l("fr_FR");
+ std::locale l("fr_FR.UTF-8");
{
typedef char C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
Modified: libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp Wed Sep 21 03:19:20 2011
@@ -32,7 +32,7 @@
}
}
{
- std::locale l("en_US");
+ std::locale l("en_US.UTF-8");
{
typedef char C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
@@ -45,7 +45,7 @@
}
}
{
- std::locale l("fr_FR");
+ std::locale l("fr_FR.UTF-8");
{
typedef char C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/assign.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/assign.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/assign.pass.cpp Wed Sep 21 03:19:20 2011
@@ -67,7 +67,7 @@
int main()
{
{
- std::locale loc("ru_RU");
+ std::locale loc("ru_RU.UTF-8");
std::locale loc2;
loc2 = loc;
assert(loc == loc2);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp Wed Sep 21 03:19:20 2011
@@ -67,12 +67,12 @@
int main()
{
{
- std::locale loc("ru_RU");
+ std::locale loc("ru_RU.UTF-8");
check(loc);
- std::locale loc2("ru_RU");
+ std::locale loc2("ru_RU.UTF-8");
check(loc2);
assert(loc == loc2);
- std::locale loc3("zh_CN");
+ std::locale loc3("zh_CN.UTF-8");
check(loc3);
assert(!(loc == loc3));
assert(loc != loc3);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/copy.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/copy.pass.cpp Wed Sep 21 03:19:20 2011
@@ -67,7 +67,7 @@
int main()
{
{
- std::locale loc("fr_FR");
+ std::locale loc("fr_FR.UTF-8");
std::locale loc2 = loc;
assert(loc == loc2);
check(loc);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/default.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/default.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/default.pass.cpp Wed Sep 21 03:19:20 2011
@@ -74,13 +74,13 @@
assert(new_called == 0);
check(loc);
assert(new_called == 0);
- assert(std::locale::global(std::locale("en_US")) == loc);
+ assert(std::locale::global(std::locale("en_US.UTF-8")) == loc);
ok = new_called;
std::locale loc2;
assert(new_called == ok);
check(loc2);
assert(new_called == ok);
- assert(loc2 == std::locale("en_US"));
+ assert(loc2 == std::locale("en_US.UTF-8"));
assert(new_called == ok);
}
assert(new_called == ok);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp Wed Sep 21 03:19:20 2011
@@ -67,9 +67,9 @@
int main()
{
{
- std::locale loc("ru_RU");
+ std::locale loc("ru_RU.UTF-8");
check(loc);
- std::locale loc2(loc, "en_US", std::locale::monetary);
+ std::locale loc2(loc, "en_US.UTF-8", std::locale::monetary);
check(loc2);
}
assert(new_called == 0);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp Wed Sep 21 03:19:20 2011
@@ -78,7 +78,7 @@
{
{
{
- std::locale loc("ru_RU");
+ std::locale loc("ru_RU.UTF-8");
check(loc);
std::locale loc2(loc, new my_facet);
check(loc2);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp Wed Sep 21 03:19:20 2011
@@ -67,9 +67,9 @@
int main()
{
{
- std::locale loc("ru_RU");
+ std::locale loc("ru_RU.UTF-8");
check(loc);
- std::locale loc2(loc, std::locale("en_US"), std::locale::monetary);
+ std::locale loc2(loc, std::locale("en_US.UTF-8"), std::locale::monetary);
check(loc2);
}
assert(new_called == 0);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp Wed Sep 21 03:19:20 2011
@@ -67,9 +67,9 @@
int main()
{
{
- std::locale loc("ru_RU");
+ std::locale loc("ru_RU.UTF-8");
check(loc);
- std::locale loc2(loc, std::string("en_US"), std::locale::monetary);
+ std::locale loc2(loc, std::string("en_US.UTF-8"), std::locale::monetary);
check(loc2);
}
assert(new_called == 0);
Modified: libcxx/trunk/test/localization/locales/locale/locale.cons/string.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locales/locale/locale.cons/string.pass.cpp?rev=140242&r1=140241&r2=140242&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locales/locale/locale.cons/string.pass.cpp (original)
+++ libcxx/trunk/test/localization/locales/locale/locale.cons/string.pass.cpp Wed Sep 21 03:19:20 2011
@@ -67,12 +67,12 @@
int main()
{
{
- std::locale loc(std::string("ru_RU"));
+ std::locale loc(std::string("ru_RU.UTF-8"));
check(loc);
- std::locale loc2(std::string("ru_RU"));
+ std::locale loc2(std::string("ru_RU.UTF-8"));
check(loc2);
assert(loc == loc2);
- std::locale loc3(std::string("zh_CN"));
+ std::locale loc3(std::string("zh_CN.UTF-8"));
check(loc3);
assert(!(loc == loc3));
assert(loc != loc3);
More information about the cfe-commits
mailing list