aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/22_locale/time_get
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/time_get')
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc10
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc10
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc10
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc10
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc10
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc10
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc6
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc8
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc4
43 files changed, 130 insertions, 130 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc
index eddb670b8b9..0e4b03b732f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/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/time_get/date_order/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc
index b899fafbe90..43e2381d2cb 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/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/time_get/date_order/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc
index eddb670b8b9..0e4b03b732f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/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/time_get/date_order/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc
index b899fafbe90..43e2381d2cb 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
index 1ea933df0e9..3e351b4df98 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.utf8" }
+// { dg-require-namedlocale "de_DE.UTF-8" }
// { dg-options " -std=gnu++11 " }
// 2014-04-14 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de>
@@ -41,7 +41,7 @@ void test02()
bool test __attribute__((unused)) = true;
locale loc_c = locale::classic();
- locale loc_de = locale("de_DE.utf8");
+ locale loc_de = locale("de_DE.UTF-8");
VERIFY( loc_de != loc_c );
istringstream iss;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
index 1f1582e5a34..89f26c45b18 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.utf8" }
+// { dg-require-namedlocale "de_DE.UTF-8" }
// { dg-options " -std=gnu++11 " }
// 2014-04-14 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de>
@@ -41,7 +41,7 @@ void test02()
bool test __attribute__((unused)) = true;
locale loc_c = locale::classic();
- locale loc_de = locale("de_DE.utf8");
+ locale loc_de = locale("de_DE.UTF-8");
VERIFY( loc_de != loc_c );
wistringstream iss;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc
index b95610ab03e..d2cf27432aa 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "is_IS" }
+// { dg-require-namedlocale "is_IS.ISO8859-1" }
// 2003-10-27 Paolo Carlini <pcarlini@suse.de>
@@ -34,7 +34,7 @@ void test01()
bool test __attribute__((unused)) = true;
// basic construction
- locale loc_is = locale("is_IS");
+ locale loc_is = locale(ISO_8859(1,is_IS));
// create an ostream-derived object, cache the time_get facet
iterator_type end;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
index 366610687b0..4f77123794b 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/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 );
@@ -63,7 +63,7 @@ void test02()
iterator_type is_it01(iss);
errorstate = good;
- // inspection of named locales, de_DE
+ // inspection of named locales, de_DE.ISO8859-15
iss.imbue(loc_de);
iss.str("04.04.1971");
iterator_type is_it10(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc
index a46b94b916e..52b74bc66b6 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "en_GB" }
+// { dg-require-namedlocale "en_GB.ISO8859-1" }
// 2010-01-06 Paolo Carlini <paolo.carlini@oracle.com>
@@ -33,7 +33,7 @@ void test01()
typedef istreambuf_iterator<char> iterator_type;
- locale loc_en = locale("en_GB");
+ locale loc_en = locale(ISO_8859(1,en_GB));
tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc
index e7a40edc897..3f3ec38f0f3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/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_date/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc
index 0853219a1d9..742a5b9339c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc
index 65eec12b5a4..7a6ad65d51e 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "is_IS" }
+// { dg-require-namedlocale "is_IS.ISO8859-1" }
// 2003-10-27 Paolo Carlini <pcarlini@suse.de>
@@ -34,7 +34,7 @@ void test01()
bool test __attribute__((unused)) = true;
// basic construction
- locale loc_is = locale("is_IS");
+ locale loc_is = locale(ISO_8859(1,is_IS));
// create an ostream-derived object, cache the time_get facet
iterator_type end;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
index aa3df0058d0..0bbd1ce864c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/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 );
@@ -63,7 +63,7 @@ void test02()
iterator_type is_it01(iss);
errorstate = good;
- // inspection of named locales, de_DE
+ // inspection of named locales, de_DE.ISO8859-15
iss.imbue(loc_de);
iss.str(L"04.04.1971");
iterator_type is_it10(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc
index b15305e50df..4ea1d71a2cb 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "en_GB" }
+// { dg-require-namedlocale "en_GB.ISO8859-1" }
// 2010-01-06 Paolo Carlini <paolo.carlini@oracle.com>
@@ -33,7 +33,7 @@ void test01()
typedef istreambuf_iterator<wchar_t> iterator_type;
- locale loc_en = locale("en_GB");
+ locale loc_en = locale(ISO_8859(1,en_GB));
tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc
index 25e79732435..a177ba78750 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "zh_TW" }
+// { dg-require-namedlocale "zh_TW.UTF-8" }
// 2003-12-17 Paolo Carlini <pcarlini@suse.de>
@@ -32,7 +32,7 @@ void test01()
typedef istreambuf_iterator<wchar_t> iterator_type;
- locale loc_tw = locale("zh_TW");
+ locale loc_tw = locale("zh_TW.UTF-8");
iterator_type end;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc
index e7a40edc897..3f3ec38f0f3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/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_date/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc
index 0853219a1d9..742a5b9339c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/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;
}
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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
index b97f66c59d9..d3a92cb7059 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/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<wchar_t>& tim_get = use_facet<time_get<wchar_t> >(iss.getloc());
- // inspection of named locales, de_DE
+ // inspection of named locales, de_DE.ISO8859-15
iss.str(L"April");
iterator_type is_it10(iss);
tm time10;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc
index e7a40edc897..3f3ec38f0f3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/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/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc
index 0853219a1d9..742a5b9339c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc
index 3445a9a371d..027492a910f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
// 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
@@ -34,7 +34,7 @@ void test01()
// basic construction and sanity checks.
locale loc_c = locale::classic();
- locale loc_de = locale("de_DE");
+ locale loc_de = locale(ISO_8859(15,de_DE));
VERIFY( loc_de != loc_c );
const string empty;
@@ -94,7 +94,7 @@ void test01()
VERIFY( *ret04 == 'a' );
VERIFY( errorstate == ios_base::failbit );
- // inspection of named locales, de_DE
+ // inspection of named locales, de_DE.ISO8859-15
iss.imbue(loc_de);
iss.str("12:00:00");
iterator_type is_it10(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
index 8f946587921..75d7e4a34a1 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
// 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
@@ -34,7 +34,7 @@ void test02()
// basic construction and sanity check
locale loc_c = locale::classic();
- locale loc_hk = locale("en_HK");
+ locale loc_hk = locale(ISO_8859(1,en_HK));
VERIFY( loc_hk != loc_c );
const string empty;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc
index e7a40edc897..3f3ec38f0f3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/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_time/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc
index 0853219a1d9..742a5b9339c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc
index 0f5c4d9f1cf..1415e3d829e 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
// 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
@@ -34,7 +34,7 @@ void test01()
// basic construction and sanity checks.
locale loc_c = locale::classic();
- locale loc_de = locale("de_DE");
+ locale loc_de = locale(ISO_8859(15,de_DE));
VERIFY( loc_de != loc_c );
const wstring empty;
@@ -94,7 +94,7 @@ void test01()
VERIFY( *ret04 == L'a' );
VERIFY( errorstate == ios_base::failbit );
- // inspection of named locales, de_DE
+ // inspection of named locales, de_DE.ISO8859-15
iss.imbue(loc_de);
iss.str(L"12:00:00");
iterator_type is_it10(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
index 7d3f6d554fc..f32067d76d7 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
// 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
@@ -34,7 +34,7 @@ void test02()
// basic construction and sanity check
locale loc_c = locale::classic();
- locale loc_hk = locale("en_HK");
+ locale loc_hk = locale(ISO_8859(1,en_HK));
VERIFY( loc_hk != loc_c );
const wstring empty;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc
index e7a40edc897..3f3ec38f0f3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/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_time/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc
index 0853219a1d9..742a5b9339c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
index 3a936d06173..47076ea2ce1 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/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()
// create "C" time objects
const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
- // inspection of named locales, de_DE
+ // inspection of named locales, de_DE.ISO8859-15
iss.imbue(loc_de);
iss.str("Sonntag");
iterator_type is_it10(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
index 5ae798d73cc..27b5da8575f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "ru_RU.ISO-8859-5" }
+// { dg-require-namedlocale "ru_RU.ISO8859-5" }
// Copyright (C) 2010-2015 Free Software Foundation, Inc.
//
@@ -33,7 +33,7 @@ void test01()
typedef istreambuf_iterator<char> iterator_type;
// basic construction
- locale loc("ru_RU.ISO-8859-5");
+ locale loc(ISO_8859(5,ru_RU));
// create an ostream-derived object, cache the time_get facet
iterator_type end;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
index 79b280bfa7a..5a8bc480914 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "ru_RU.UTF8" }
+// { dg-require-namedlocale "ru_RU.UTF-8" }
// 2010-01-05 Paolo Carlini <paolo.carlini@oracle.com>
@@ -34,7 +34,7 @@ void test01()
typedef istreambuf_iterator<char> iterator_type;
// basic construction
- locale loc("ru_RU.UTF8");
+ locale loc("ru_RU.UTF-8");
// create an ostream-derived object, cache the time_get facet
iterator_type end;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc
index e7a40edc897..3f3ec38f0f3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/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_weekday/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc
index 0853219a1d9..742a5b9339c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
index 47102a3e521..d557c18eb9a 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/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()
// create "C" time objects
const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
- // inspection of named locales, de_DE
+ // inspection of named locales, de_DE.ISO8859-15
iss.imbue(loc_de);
iss.str(L"Sonntag");
iterator_type is_it10(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc
index e1789beda11..5102a79dd14 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.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-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_weekday/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
index 691253d2235..896d5982db2 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
@@ -1,6 +1,6 @@
-// { dg-require-namedlocale "en_HK" }
-// { dg-require-namedlocale "de_DE" }
-// { dg-require-namedlocale "ja_JP.eucjp" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "ja_JP.eucJP" }
// 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;
}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc
index 85cb3de61eb..4fe83399ec1 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/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>
@@ -37,6 +37,6 @@ int main()
func_callback two;
two.push_back(&test01);
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_year/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc
index d7b5b1886d9..57e2bc85026 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/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>
@@ -37,6 +37,6 @@ int main()
func_callback two;
two.push_back(&test01);
two.push_back(&test03);
- 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/time_get/get_year/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc
index 85cb3de61eb..4fe83399ec1 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/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>
@@ -37,6 +37,6 @@ int main()
func_callback two;
two.push_back(&test01);
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_year/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc
index d7b5b1886d9..57e2bc85026 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/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>
@@ -37,6 +37,6 @@ int main()
func_callback two;
two.push_back(&test01);
two.push_back(&test03);
- run_tests_wrapped_locale("ja_JP.eucjp", two);
+ run_tests_wrapped_locale("ja_JP.eucJP", two);
return 0;
}