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

re PR libstdc++/49293 (22_locale/time_get/get_weekday/char/38081-[12].cc fail with glibc 2.14) 

2011-06-07  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/49293
	* testsuite/22_locale/time_get/get_weekday/char/38081-1.cc: Tweak
	for glibc 2.14.
	* testsuite/22_locale/time_get/get_weekday/char/38081-2.cc: Likewise.

From-SVN: r174737
This commit is contained in:
Paolo Carlini 2011-06-07 08:50:04 +00:00 committed by Paolo Carlini
parent 383d9c8375
commit 34b6bcade4
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2011-06-07 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/49293
* testsuite/22_locale/time_get/get_weekday/char/38081-1.cc: Tweak
for glibc 2.14.
* testsuite/22_locale/time_get/get_weekday/char/38081-2.cc: Likewise.
2011-06-06 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/move.h (move_if_noexcept): Use __and_ and __not_.

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

@ -1,6 +1,6 @@
// { dg-require-namedlocale "ru_RU.ISO-8859-5" }
// Copyright (C) 2010 Free Software Foundation
// Copyright (C) 2010, 2011 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
@ -49,7 +49,11 @@ void test01()
// get_weekday(iter_type, iter_type, ios_base&,
// ios_base::iostate&, tm*) const
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
iss.str("\xbf\xdd\x2e");
#else
iss.str("\xbf\xdd\xd4");
#endif
iterator_type is_it01(iss);
tm time01;
memset(&time01, -1, sizeof(tm));
@ -67,7 +71,11 @@ void test01()
VERIFY( time02.tm_wday == 1 );
VERIFY( errorstate == ios_base::eofbit );
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
iss.str("\xbf\xdd\x2e\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda");
#else
iss.str("\xbf\xdd\xd4\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda");
#endif
iterator_type is_it03(iss);
tm time03;
memset(&time03, -1, sizeof(tm));

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

@ -2,7 +2,7 @@
// 2010-01-05 Paolo Carlini <paolo.carlini@oracle.com>
// Copyright (C) 2010 Free Software Foundation
// Copyright (C) 2010, 2011 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
@ -50,6 +50,15 @@ void test01()
// get_weekday(iter_type, iter_type, ios_base&,
// ios_base::iostate&, tm*) const
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
const char* awdays[7] = { "\u0412\u0441\u002E",
"\u041F\u043D\u002E",
"\u0412\u0442\u002E",
"\u0421\u0440\u002E",
"\u0427\u0442\u002E",
"\u041F\u0442\u002E",
"\u0421\u0431\u002E" };
#else
const char* awdays[7] = { "\u0412\u0441\u043A",
"\u041F\u043D\u0434",
"\u0412\u0442\u0440",
@ -57,6 +66,7 @@ void test01()
"\u0427\u0442\u0432",
"\u041F\u0442\u043D",
"\u0421\u0431\u0442" };
#endif
for (int i = 0; i < 7; ++i)
{