diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t')
4 files changed, 10 insertions, 10 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc index d0d3831a1ff..7b0c286be5d 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson <peturr02@ru.is> @@ -32,12 +32,12 @@ void test02() bool test __attribute__((unused)) = true; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); locale::global(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc); int k = cvt->max_length(); - VERIFY( k == 1 ); // ISO-8859-1 is a single-byte encoding + VERIFY( k == 1 ); // ISO8859-1 is a single-byte encoding } int main () diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc index 269a15d8056..3111fc6ad8a 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson <peturr02@ru.is> @@ -32,12 +32,12 @@ void test03() bool test __attribute__((unused)) = true; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; - locale loc = locale("en_US.ISO-8859-15"); + locale loc = locale(ISO_8859(1,en_US)); locale::global(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc); int k = cvt->max_length(); - VERIFY( k == 1 ); // ISO-8859-15 is a single-byte encoding + VERIFY( k == 1 ); // ISO8859-1 is a single-byte encoding } int main () diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc index eddb670b8b9..0e4b03b732f 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/max_length/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - run_tests_wrapped_locale("ja_JP.eucjp", two); + run_tests_wrapped_locale("ja_JP.eucJP", two); return 0; } |