diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2004-08-19 20:47:39 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2004-08-19 20:47:39 +0000 |
| commit | b85058289589ba4346f6881b5f0cba0410299fc0 (patch) | |
| tree | 985c0f06b0e53550574b6e537dad739c32f30c3b | |
| parent | d5bfecf2ff4b10d7fd828e288be17bd84a4ab651 (diff) | |
| download | gcc-b85058289589ba4346f6881b5f0cba0410299fc0.zip gcc-b85058289589ba4346f6881b5f0cba0410299fc0.tar.gz gcc-b85058289589ba4346f6881b5f0cba0410299fc0.tar.bz2 | |
3.cc (test03): Don't check timezone.
2004-08-19 Benjamin Kosnik <bkoz@redhat.com>
* 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.
From-SVN: r86271
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc | 6 | ||||
| -rw-r--r-- | 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 f849f16..7c51776 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2004-08-19 Benjamin Kosnik <bkoz@redhat.com> + + * 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 <pcarlini@suse.de> * 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 3a46e83..4300e7d 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 72c702c..5494d76 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() |