diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t')
3 files changed, 15 insertions, 15 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc index 72d84a9b578..352d7a92bd6 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-01-17 Benjamin Kosnik <bkoz@redhat.com> @@ -34,9 +34,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_is = locale("is_IS"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_is = locale(ISO_8859(1,is_IS)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_is ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc index ab24f85624d..e92737be777 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -39,6 +39,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/numpunct/members/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc index 5cfd13410d4..996b4452a6c 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -40,6 +40,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - run_tests_wrapped_locale("ja_JP.eucjp", two); + run_tests_wrapped_locale("ja_JP.eucJP", two); return 0; } |