summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de>2016-03-15 15:55:58 +0000
committerJonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de>2016-03-15 15:55:58 +0000
commit83bedca7e96edd55f1d2bd1149a0dfd6952859cd (patch)
tree5f327547ba7215b4dabd49d287ca859547607d14
parent0fb87f77ae98a6ec62cf96c3adc380724a968d16 (diff)
downloadbcm5719-llvm-83bedca7e96edd55f1d2bd1149a0dfd6952859cd.tar.gz
bcm5719-llvm-83bedca7e96edd55f1d2bd1149a0dfd6952859cd.zip
[libcxx] Remove localization tests for Russian month names
Commit f49839299a085505eb673544744b61d2d9cdd1db in glibc-2.14 changed the locales to the currently required format. However, they were again changed in commit 55bdd2866f23b28422d969060b3518909a12b100 which has been released in 2.17. That leads to the current situation where Debian and e.g. CentOS 6 have the pre-2.14 locales, for example Ubuntu 14.04 has pre-2.17 and CentOS 7 on the other hand has the newest locales in glibc-2.17. Differential Revision: http://reviews.llvm.org/D18187 llvm-svn: 263554
-rw-r--r--libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp17
-rw-r--r--libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp17
2 files changed, 0 insertions, 34 deletions
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
index 7ad431652a8..931ab5d4096 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
@@ -9,15 +9,8 @@
// REQUIRES: locale.en_US.UTF-8
// REQUIRES: locale.fr_FR.UTF-8
-// REQUIRES: locale.ru_RU.UTF-8
// REQUIRES: locale.zh_CN.UTF-8
-// NOTE: debian and opensuse use old locale data for ru_RU.UTF-8 abbreviated
-// months. This locale data was changed in glibc 2.14.
-// Debian uses glibc 2.13 as of 20/11/2014
-// OpenSuse uses glibc 2.19 with old locale data as of 20/11/2014
-// XFAIL: debian, opensuse
-
// <locale>
// class time_get_byname<charT, InputIterator>
@@ -70,16 +63,6 @@ int main()
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f(LOCALE_ru_RU_UTF_8, 1);
- const char in[] = "\xD0\xB8\xD1\x8E\xD0\xBD\xD1\x8F";
- err = std::ios_base::goodbit;
- t = std::tm();
- I i = f.get_monthname(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t);
- assert(i.base() == in+sizeof(in)/sizeof(in[0])-1);
- assert(t.tm_mon == 5);
- assert(err == std::ios_base::eofbit);
- }
- {
const my_facet f(LOCALE_zh_CN_UTF_8, 1);
const char in[] = "\xE5\x85\xAD\xE6\x9C\x88";
err = std::ios_base::goodbit;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
index 631a6de03d8..551f298b041 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
@@ -9,15 +9,8 @@
// REQUIRES: locale.en_US.UTF-8
// REQUIRES: locale.fr_FR.UTF-8
-// REQUIRES: locale.ru_RU.UTF-8
// REQUIRES: locale.zh_CN.UTF-8
-// NOTE: debian and opensuse use bad locale data for ru_RU.UTF-8 abbreviated
-// months. This locale data was fixed in glibc 2.14.
-// Debian uses glibc 2.13 as of 20/11/2014
-// OpenSuse uses glibc 2.19 with old locale data as of 20/11/2014
-// XFAIL: debian, opensuse
-
// <locale>
// class time_get_byname<charT, InputIterator>
@@ -79,16 +72,6 @@ int main()
assert(err == std::ios_base::eofbit);
}
{
- const my_facet f(LOCALE_ru_RU_UTF_8, 1);
- const wchar_t in[] = L"\x438\x44E\x43D\x44F";
- err = std::ios_base::goodbit;
- t = std::tm();
- I i = f.get_monthname(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t);
- assert(i.base() == in+sizeof(in)/sizeof(in[0])-1);
- assert(t.tm_mon == 5);
- assert(err == std::ios_base::eofbit);
- }
- {
const my_facet f(LOCALE_zh_CN_UTF_8, 1);
const wchar_t in[] = L"\x516D\x6708";
err = std::ios_base::goodbit;
OpenPOWER on IntegriCloud