38081-1.cc (test01): Don't expect dots after abbreviated weekday names for ru_RU...

	libstdc++-v3/
	* testsuite/22_locale/time_get/get_weekday/char/38081-1.cc (test01):
	Don't expect dots after abbreviated weekday names for ru_RU for
	glibc versions >= 2.17.
	* testsuite/22_locale/time_get/get_weekday/char/38081-2.cc (test01):
	Likewise.

From-SVN: r195971

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8dfc294741adc9a5e527e29b4ce67f0401e491fc..0c631f10ec16112f28182200b97da62b180f9d7e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-12  Julian Brown  <julian@codesourcery.com>
+
+       * testsuite/22_locale/time_get/get_weekday/char/38081-1.cc (test01):
+       Don't expect dots after abbreviated weekday names for ru_RU for
+       glibc versions >= 2.17.
+       * testsuite/22_locale/time_get/get_weekday/char/38081-2.cc (test01):
+       Likewise.
+
 2013-02-12  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/bits/random.tcc (__transform): Remove.

diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
index 77edb67b1c55a015b91095d67db75a20632f0a3f..f33e4b1e5200966fec3fa467749b0e342c72167b 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
@@ -50,7 +50,11 @@ void test01()
   //             ios_base::iostate&, tm*) const
 
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
+# if __GLIBC__ > 2 || __GLIBC_MINOR__ >= 17
+  iss.str("\xbf\xdd");
+# else
   iss.str("\xbf\xdd\x2e");
+# endif
 #else
   iss.str("\xbf\xdd\xd4");
 #endif
@@ -72,7 +76,11 @@ void test01()
   VERIFY( errorstate == ios_base::eofbit );
 
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
+# if __GLIBC__ > 2 || __GLIBC_MINOR__ >= 17
+  iss.str("\xbf\xdd\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda");
+# else
   iss.str("\xbf\xdd\x2e\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda");
+# endif
 #else
   iss.str("\xbf\xdd\xd4\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda");
 #endif

diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
index aa5eceb4a2f7da544ebda58cec5038cc91d2a7a9..b0bffe0d973ae3106be131dc97d2528b50192164 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
@@ -51,6 +51,15 @@ void test01()
   //             ios_base::iostate&, tm*) const
 
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
+# if __GLIBC__ > 2 || __GLIBC_MINOR__ >= 17
+  const char* awdays[7] = { "\u0412\u0441",
+                           "\u041F\u043D",
+                           "\u0412\u0442",
+                           "\u0421\u0440",
+                           "\u0427\u0442",
+                           "\u041F\u0442",
+                           "\u0421\u0431" };
+# else
   const char* awdays[7] = { "\u0412\u0441\u002E",
                            "\u041F\u043D\u002E",
                            "\u0412\u0442\u002E",
@@ -58,6 +67,7 @@ void test01()
                            "\u0427\u0442\u002E",
                            "\u041F\u0442\u002E",
                            "\u0421\u0431\u002E" };
+#endif
 #else
   const char* awdays[7] = { "\u0412\u0441\u043A",
                            "\u041F\u043D\u0434",