diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2011-09-21 14:59:10 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2011-09-21 14:59:10 +0000 |
| commit | 71850c961d86d1cb657a83b98241ee5c35cda21c (patch) | |
| tree | c7662d3345a878ed64f40a4b40aeac089887906b /libcxx/test/input.output/iostream.format | |
| parent | b25f615c588edb959545f551a25e168aafacfbfa (diff) | |
| download | bcm5719-llvm-71850c961d86d1cb657a83b98241ee5c35cda21c.tar.gz bcm5719-llvm-71850c961d86d1cb657a83b98241ee5c35cda21c.zip | |
More fixes to the tests. Add UTF-8 encoding to all locales that don't specify one. Undefine some stdio.h macros that break the tests.
llvm-svn: 140252
Diffstat (limited to 'libcxx/test/input.output/iostream.format')
4 files changed, 12 insertions, 12 deletions
diff --git a/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp index 22ed819ef03..8230fe92760 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp @@ -39,7 +39,7 @@ int main() { testbuf<char> sb(" -$1,234,567.89"); std::istream is(&sb); - is.imbue(std::locale("en_US")); + is.imbue(std::locale("en_US.UTF-8")); long double x = 0; is >> std::get_money(x, false); assert(x == -123456789); @@ -47,7 +47,7 @@ int main() { testbuf<char> sb(" -USD 1,234,567.89"); std::istream is(&sb); - is.imbue(std::locale("en_US")); + is.imbue(std::locale("en_US.UTF-8")); long double x = 0; is >> std::get_money(x, true); assert(x == -123456789); @@ -55,7 +55,7 @@ int main() { testbuf<wchar_t> sb(L" -$1,234,567.89"); std::wistream is(&sb); - is.imbue(std::locale("en_US")); + is.imbue(std::locale("en_US.UTF-8")); long double x = 0; is >> std::get_money(x, false); assert(x == -123456789); @@ -63,7 +63,7 @@ int main() { testbuf<wchar_t> sb(L" -USD 1,234,567.89"); std::wistream is(&sb); - is.imbue(std::locale("en_US")); + is.imbue(std::locale("en_US.UTF-8")); long double x = 0; is >> std::get_money(x, true); assert(x == -123456789); diff --git a/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp index 6196a83689b..9804015a7bf 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp @@ -39,7 +39,7 @@ int main() { testbuf<char> sb(" Sat Dec 31 23:55:59 2061"); std::istream is(&sb); - is.imbue(std::locale("en_US")); + is.imbue(std::locale("en_US.UTF-8")); std::tm t = {0}; is >> std::get_time(&t, "%c"); assert(t.tm_sec == 59); @@ -55,7 +55,7 @@ int main() { testbuf<wchar_t> sb(L" Sat Dec 31 23:55:59 2061"); std::wistream is(&sb); - is.imbue(std::locale("en_US")); + is.imbue(std::locale("en_US.UTF-8")); std::tm t = {0}; is >> std::get_time(&t, L"%c"); assert(t.tm_sec == 59); diff --git a/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp index 46bd1b709a3..0b06818957e 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp @@ -51,7 +51,7 @@ int main() { testbuf<char> sb; std::ostream os(&sb); - os.imbue(std::locale("en_US")); + os.imbue(std::locale("en_US.UTF-8")); showbase(os); long double x = -123456789; os << std::put_money(x, false); @@ -60,7 +60,7 @@ int main() { testbuf<char> sb; std::ostream os(&sb); - os.imbue(std::locale("en_US")); + os.imbue(std::locale("en_US.UTF-8")); showbase(os); long double x = -123456789; os << std::put_money(x, true); @@ -69,7 +69,7 @@ int main() { testbuf<wchar_t> sb; std::wostream os(&sb); - os.imbue(std::locale("en_US")); + os.imbue(std::locale("en_US.UTF-8")); showbase(os); long double x = -123456789; os << std::put_money(x, false); @@ -78,7 +78,7 @@ int main() { testbuf<wchar_t> sb; std::wostream os(&sb); - os.imbue(std::locale("en_US")); + os.imbue(std::locale("en_US.UTF-8")); showbase(os); long double x = -123456789; os << std::put_money(x, true); diff --git a/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp index 3276dbdf537..9f5710d9153 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp @@ -51,7 +51,7 @@ int main() { testbuf<char> sb; std::ostream os(&sb); - os.imbue(std::locale("en_US")); + os.imbue(std::locale("en_US.UTF-8")); std::tm t = {0}; t.tm_sec = 59; t.tm_min = 55; @@ -66,7 +66,7 @@ int main() { testbuf<wchar_t> sb; std::wostream os(&sb); - os.imbue(std::locale("en_US")); + os.imbue(std::locale("en_US.UTF-8")); std::tm t = {0}; t.tm_sec = 59; t.tm_min = 55; |
