diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/messages/members/char')
5 files changed, 18 insertions, 18 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc index ff60a1842c7..8cfbaae00ee 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-07-17 Benjamin Kosnik <bkoz@redhat.com> @@ -36,7 +36,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // cache the messages facets @@ -46,7 +46,7 @@ void test01() // string_type get(catalog, int, int, const string_type& ) const; // void close(catalog) const; - // Check German (de_DE) locale. + // Check German (de_DE.ISO8859-15) locale. catalog cat_de = mssg_de.open("libstdc++", loc_c, dir); string s01 = mssg_de.get(cat_de, 0, 0, "please"); string s02 = mssg_de.get(cat_de, 0, 0, "thank you"); diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc index 11ced8fb95f..699ca2d8e69 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-07-17 Benjamin Kosnik <bkoz@redhat.com> @@ -35,7 +35,7 @@ void test02() const char* dir = LOCALEDIR; // basic construction - locale loc_fr = locale("fr_FR"); + locale loc_fr = locale(ISO_8859(15,fr_FR)); VERIFY( locale::classic() != loc_fr ); // cache the messages facets diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc index 8ed0a7a81fc..889e3857814 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-07-17 Benjamin Kosnik <bkoz@redhat.com> @@ -37,8 +37,8 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); VERIFY( loc_c != loc_us ); VERIFY( loc_us != loc_fr ); diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc index 77a4ffe0453..97513fa42b5 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "en_US.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_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/messages/members/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc index 8dd71b5982c..26fb30241fa 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -45,6 +45,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; } |