diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/time_get/get_weekday')
8 files changed, 28 insertions, 28 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc index 3a936d06173..47076ea2ce1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com> @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -54,7 +54,7 @@ void test02() // create "C" time objects const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str("Sonntag"); iterator_type is_it10(iss); 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 5ae798d73cc..27b5da8575f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ru_RU.ISO-8859-5" } +// { dg-require-namedlocale "ru_RU.ISO8859-5" } // Copyright (C) 2010-2015 Free Software Foundation, Inc. // @@ -33,7 +33,7 @@ void test01() typedef istreambuf_iterator<char> iterator_type; // basic construction - locale loc("ru_RU.ISO-8859-5"); + locale loc(ISO_8859(5,ru_RU)); // create an ostream-derived object, cache the time_get facet iterator_type end; 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 79b280bfa7a..5a8bc480914 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ru_RU.UTF8" } +// { dg-require-namedlocale "ru_RU.UTF-8" } // 2010-01-05 Paolo Carlini <paolo.carlini@oracle.com> @@ -34,7 +34,7 @@ void test01() typedef istreambuf_iterator<char> iterator_type; // basic construction - locale loc("ru_RU.UTF8"); + locale loc("ru_RU.UTF-8"); // create an ostream-derived object, cache the time_get facet iterator_type end; diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc index e7a40edc897..3f3ec38f0f3 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - run_tests_wrapped_env("de_DE", "LANG", two); + run_tests_wrapped_env(ISO_8859(15,de_DE), "LANG", two); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc index 0853219a1d9..742a5b9339c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - run_tests_wrapped_locale("ja_JP.eucjp", two); + run_tests_wrapped_locale("ja_JP.eucJP", two); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc index 47102a3e521..d557c18eb9a 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com> @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -54,7 +54,7 @@ void test02() // create "C" time objects const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str(L"Sonntag"); iterator_type is_it10(iss); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc index e1789beda11..5102a79dd14 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - run_tests_wrapped_env("de_DE", "LANG", two); + run_tests_wrapped_env(ISO_8859(15,de_DE), "LANG", two); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc index 691253d2235..896d5982db2 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - run_tests_wrapped_locale("ja_JP.eucjp", two); + run_tests_wrapped_locale("ja_JP.eucJP", two); return 0; } |