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

re PR libstdc++/36616 (Open issues from a test run)

Browse Source 
2008-07-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/36616
	* testsuite/22_locale/time_put/put/char/4.cc: Just use es_ES instead.
	* testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise.

From-SVN: r137467
This commit is contained in:
Paolo Carlini 2008-07-04 15:40:38 +00:00 committed by Paolo Carlini
parent f47687a1c2
commit 99805865c5
3 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2008-07-04 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/36616
* testsuite/22_locale/time_put/put/char/4.cc: Just use es_ES instead.
* testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise.
2008-07-03 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc:

30
libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc
View File

@ -39,30 +39,22 @@ void test04()
// basic construction and sanity check
locale loc_c = locale::classic();
locale loc_fr = locale("fr_FR@euro");
VERIFY( loc_fr != loc_c );
locale loc_es = locale("es_ES");
VERIFY( loc_es != loc_c );
// create an ostream-derived object, cache the time_put facet
const string empty;
ostringstream oss;
oss.imbue(loc_fr);
oss.imbue(loc_es);
const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc());
iterator_type os_it04 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a');
string result4 = oss.str();
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 7)
VERIFY( result4 == "dim." );
#else
VERIFY( result4 == "dim" );
#endif
VERIFY( result4 == "dom" );
oss.str(empty); // "%d.%m.%Y"
oss.str(empty); // "%d/%m/%y"
iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x');
string result27 = oss.str();
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 7)
VERIFY( result27 == "04/04/1971" );
#else
VERIFY( result27 == "04.04.1971" );
#endif
string result27 = oss.str(); // "04/04/71"
VERIFY( result27 == "04/04/71" );
oss.str(empty); // "%T"
iterator_type os_it28 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X');
@ -71,12 +63,8 @@ void test04()
oss.str(empty);
iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E');
string result37 = oss.str();
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 7)
VERIFY( result37 == "04/04/1971" );
#else
VERIFY( result37 == "04.04.1971" );
#endif
string result37 = oss.str(); // "04/04/71"
VERIFY( result37 == "04/04/71" );
oss.str(empty);
iterator_type os_it38 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E');

30
libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc
View File

@ -39,30 +39,22 @@ void test04()
// basic construction and sanity check
locale loc_c = locale::classic();
locale loc_fr = locale("fr_FR@euro");
VERIFY( loc_fr != loc_c );
locale loc_es = locale("es_ES");
VERIFY( loc_es != loc_c );
// create an ostream-derived object, cache the time_put facet
const wstring empty;
wostringstream oss;
oss.imbue(loc_fr);
oss.imbue(loc_es);
const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc());
iterator_type os_it04 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a');
wstring result4 = oss.str();
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 7)
VERIFY( result4 == L"dim." );
#else
VERIFY( result4 == L"dim" );
#endif
VERIFY( result4 == L"dom" );
oss.str(empty); // "%d.%m.%Y"
oss.str(empty); // "%d/%m/%y"
iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x');
wstring result27 = oss.str();
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 7)
VERIFY( result27 == L"04/04/1971" );
#else
VERIFY( result27 == L"04.04.1971" );
#endif
wstring result27 = oss.str(); // "04/04/71"
VERIFY( result27 == L"04/04/71" );
oss.str(empty); // "%T"
iterator_type os_it28 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X');
@ -71,12 +63,8 @@ void test04()
oss.str(empty);
iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E');
wstring result37 = oss.str();
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 7)
VERIFY( result37 == L"04/04/1971" );
#else
VERIFY( result37 == L"04.04.1971" );
#endif
wstring result37 = oss.str(); // "04/04/71"
VERIFY( result37 == L"04/04/71" );
oss.str(empty);
iterator_type os_it38 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E');