diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/codecvt/encoding')
6 files changed, 16 insertions, 16 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/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/encoding/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/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; } diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc index 96b15677a25..5e21cbb09f7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/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> @@ -27,19 +27,19 @@ // Required instantiation // codecvt<wchar_t, char, mbstate_t> // -// Test do_encoding with ISO-8859-1 locale. +// Test do_encoding with ISO8859-1 locale. void test02() { using namespace std; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; bool test __attribute__((unused)) = true; - 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 i = cvt->encoding(); - VERIFY( i == 1 ); // ISO-8859-1 is a single-byte encoding + VERIFY( i == 1 ); // ISO8859-1 is a single-byte encoding } int main () diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc index b5d1d40c6fe..a2070f60e40 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/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> @@ -27,19 +27,19 @@ // Required instantiation // codecvt<wchar_t, char, mbstate_t> // -// Test do_encoding with ISO-8859-15 locale. +// Test do_encoding with ISO8859-1 locale. void test03() { using namespace std; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; bool test __attribute__((unused)) = true; - 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 i = cvt->encoding(); - VERIFY( i == 1 ); // ISO-8859-15 is a single-byte encoding + VERIFY( i == 1 ); // ISO8859-1 is a single-byte encoding } int main () diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc index eddb670b8b9..0e4b03b732f 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/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/encoding/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/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; } |