diff options
| author | Julian Brown <julian@codesourcery.com> | 2013-02-12 10:32:01 +0000 |
|---|---|---|
| committer | Julian Brown <jules@gcc.gnu.org> | 2013-02-12 10:32:01 +0000 |
| commit | 1590a83511111c9621a72800b361589aa11734b9 (patch) | |
| tree | 7db7eb883ae6943630861be696c26d1e55d142b7 | |
| parent | 60f3a59f296b3411cff8860e648a0d0a253b4a8b (diff) | |
| download | gcc-1590a83511111c9621a72800b361589aa11734b9.zip gcc-1590a83511111c9621a72800b361589aa11734b9.tar.gz gcc-1590a83511111c9621a72800b361589aa11734b9.tar.bz2 | |
38081-1.cc (test01): Don't expect dots after abbreviated weekday names for ru_RU for glibc versions...
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc | 10 |
3 files changed, 26 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8dfc294..0c631f1 100644 --- 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 77edb67..f33e4b1 100644 --- 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 aa5eceb..b0bffe0 100644 --- 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", |