From 691b67574bd5ef5697f80d81d20dbb2f81965ba1 Mon Sep 17 00:00:00 2001 From: bkoz Date: Thu, 19 Aug 2004 20:47:39 +0000 Subject: [PATCH] 2004-08-19 Benjamin Kosnik * testsuite/22_locale/time_put/put/char/3.cc (test03): Don't check timezone. * testsuite/22_locale/time_put/put/wchar_t/3.cc (test03): Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86271 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc | 6 +++--- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc | 7 ++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f849f164c79..7c517766839 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2004-08-19 Benjamin Kosnik + + * testsuite/22_locale/time_put/put/char/3.cc (test03): Don't check + timezone. + * testsuite/22_locale/time_put/put/wchar_t/3.cc (test03): Same. + 2004-08-19 Paolo Carlini * testsuite/performance/20_util/allocator/insert.cc: For std::map diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc index 3a46e83995d..4300e7da799 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc @@ -56,8 +56,8 @@ void test03() oss.str(empty); // "%I:%M:%S %Z" iterator_type os_it26 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); - string result26 = oss.str(); // "12:00:00 CET" - VERIFY( result26 == "12:00:00 CET" ); + string result26 = oss.str(); // "12:00:00 CET" or whatever timezone + VERIFY( result26.find("12:00:00") != string::npos ); oss.str(empty); iterator_type os_it35 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); @@ -67,7 +67,7 @@ void test03() oss.str(empty); iterator_type os_it36 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result36 = oss.str(); // "12:00:00 CET" - VERIFY( result36 == "12:00:00 CET" ); + VERIFY( result36.find("12:00:00") != string::npos ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc index 72c702c5fb6..5494d76245b 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc @@ -56,8 +56,8 @@ void test03() oss.str(empty); // "%I:%M:%S %Z" iterator_type os_it26 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); - wstring result26 = oss.str(); // "12:00:00 CET" - VERIFY( result26 == L"12:00:00 CET" ); + wstring result26 = oss.str(); // "12:00:00 CET" or whatever timezone + VERIFY( result26.find(L"12:00:00") != wstring::npos ); oss.str(empty); iterator_type os_it35 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); @@ -67,7 +67,8 @@ void test03() oss.str(empty); iterator_type os_it36 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result36 = oss.str(); // "12:00:00 CET" - VERIFY( result36 == L"12:00:00 CET" ); + VERIFY( result36.find(L"12:00:00") != wstring::npos ); + } int main() -- 2.11.0