time_put_members_char.cc (test01): Allow either "Son" or "So" as abbreviated name...

2004-07-08  Ulrich Weigand  <uweigand@de.ibm.com>

	* testsuite/22_locale/time_put_members_char.cc (test01): Allow either
	"Son" or "So" as abbreviated name for Sunday in de_DE locale.
	* testsuite/22_locale/time_put_members_wchar_t.cc (test01): Likewise.

From-SVN: r84284

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ee8545b49d74ae1a4696d3e7c7f5a74eed81599b..b773833b0b12c626a0d4d858717b912b5cb9e223 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-08  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * testsuite/22_locale/time_put_members_char.cc (test01): Allow either 
+       "Son" or "So" as abbreviated name for Sunday in de_DE locale.
+       * testsuite/22_locale/time_put_members_wchar_t.cc (test01): Likewise.
+
 2004-06-28  David Asher  <david.asher@cavium.com>
 
        PR libstdc++/11352

diff --git a/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc b/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc
index c657706f714a5c482a20d9ac6697129e03174261..e89fa457a7393edcd88a8e9b145604a4a733290c 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002 Free Software Foundation
+// Copyright (C) 2001, 2002, 2004 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -89,7 +89,7 @@ void test01()
   oss.imbue(loc_de);
   iterator_type os_it02 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a');
   string result2 = oss.str();
-  VERIFY( result2 == "Son" );
+  VERIFY( result2 == "Son" || result2 == "So" );
 
   oss.str(empty); // "%d.%m.%Y"
   iterator_type os_it23 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x');

diff --git a/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc
index 347f41f526e67a12ab19855910314bfbccb8c738..d7a011646d8740da45f8c041fda2c9678cab0dc2 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc
@@ -1,6 +1,6 @@
 // 2001-10-02 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002 Free Software Foundation
+// Copyright (C) 2001, 2002, 2004 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -91,7 +91,7 @@ void test01()
   oss.imbue(loc_de);
   iterator_type os_it02 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a');
   wstring result2 = oss.str();
-  VERIFY( result2 == L"Son" );
+  VERIFY( result2 == L"Son" || result2 == L"So" );
 
   oss.str(empty); // "%d.%m.%Y"
   iterator_type os_it23 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x');