summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/testsuite
diff options
context:
space:
mode:
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2004-08-19 20:47:39 +0000
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2004-08-19 20:47:39 +0000
commit691b67574bd5ef5697f80d81d20dbb2f81965ba1 (patch)
tree985c0f06b0e53550574b6e537dad739c32f30c3b /libstdc++-v3/testsuite
parent644643f642d614e7e3f07c1b692da4d338bcaaea (diff)
downloadppe42-gcc-691b67574bd5ef5697f80d81d20dbb2f81965ba1.tar.gz
ppe42-gcc-691b67574bd5ef5697f80d81d20dbb2f81965ba1.zip
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86271 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite')
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc7
2 files changed, 7 insertions, 6 deletions
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()
OpenPOWER on IntegriCloud