OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Julian Brown 2013-02-12 10:32:01 +00:00 committed by Julian Brown
parent 60f3a59f29
commit 1590a83511
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -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.

8
libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
View File

@ -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

10
libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
View File

@ -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",