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.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@140252 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Chisnall
2011-09-21 14:59:10 +00:00
parent a824f53600
commit db2e99f852
7 changed files with 43 additions and 19 deletions

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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;