From 99805865c56f80f6c32d7acdec400bb8464c8359 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 4 Jul 2008 15:40:38 +0000 Subject: [PATCH] re PR libstdc++/36616 (Open issues from a test run) 2008-07-04 Paolo Carlini 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 --- libstdc++-v3/ChangeLog | 6 ++++ .../22_locale/time_put/put/char/4.cc | 30 ++++++------------- .../22_locale/time_put/put/wchar_t/4.cc | 30 ++++++------------- 3 files changed, 24 insertions(+), 42 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a937a52aa92..1f47acdf2d3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2008-07-04 Paolo Carlini + + 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 * testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc: diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc index 2fb6cf6ae74..c28738d742b 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc @@ -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& tim_put = use_facet >(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'); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc index 09920521945..c3d312da7d7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc @@ -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& tim_put = use_facet >(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'); -- 2.30.2