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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f849f164c794cc87d6bc5abaf906f5ce4b3b0cc2..7c51776683955ef0f70980d1b0cb467fe438f6e5 100644 (file)
--- 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 3a46e83995d6f9d6a48c1cf662688ac35f44c573..4300e7da79969616237a3c567d4e56bc1a3e610b 100644 (file)
--- 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 72c702c5fb6523fd2ca01f97e2c59c1938cdc9ff..5494d76245b1a4fc6096c98039270d8d4e7ff5ee 100644 (file)
--- 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()