diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char')
3 files changed, 12 insertions, 12 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc index 158047299ac..7ceb6c46784 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/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() iss.imbue(loc_de); const time_get<char>& tim_get = use_facet<time_get<char> >(iss.getloc()); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.str("April"); iterator_type is_it10(iss); tm time10; diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc index e7a40edc897..3f3ec38f0f3 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/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_monthname/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc index 0853219a1d9..742a5b9339c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/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; } |