diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp @@ -13,6 +13,8 @@ // explicit codecvt_byname(const char* nm, size_t refs = 0); // explicit codecvt_byname(const string& nm, size_t refs = 0); +// REQUIRES: locale.en_US.UTF-8 + #include #include @@ -40,12 +42,12 @@ int main(int, char**) { { - std::locale l(std::locale::classic(), new my_facet(LOCALE_en_US)); + std::locale l(std::locale::classic(), new my_facet(LOCALE_en_US_UTF_8)); assert(my_facet::count == 1); } assert(my_facet::count == 0); { - my_facet f(LOCALE_en_US, 1); + my_facet f(LOCALE_en_US_UTF_8, 1); assert(my_facet::count == 1); { std::locale l(std::locale::classic(), &f); @@ -55,12 +57,12 @@ } assert(my_facet::count == 0); { - std::locale l(std::locale::classic(), new my_facet(std::string(LOCALE_en_US))); + std::locale l(std::locale::classic(), new my_facet(std::string(LOCALE_en_US_UTF_8))); assert(my_facet::count == 1); } assert(my_facet::count == 0); { - my_facet f(std::string(LOCALE_en_US), 1); + my_facet f(std::string(LOCALE_en_US_UTF_8), 1); assert(my_facet::count == 1); { std::locale l(std::locale::classic(), &f); diff --git a/libcxx/test/support/platform_support.h b/libcxx/test/support/platform_support.h --- a/libcxx/test/support/platform_support.h +++ b/libcxx/test/support/platform_support.h @@ -17,7 +17,6 @@ #include "test_macros.h" // locale names -#define LOCALE_en_US "en_US" #define LOCALE_en_US_UTF_8 "en_US.UTF-8" #define LOCALE_fr_FR_UTF_8 "fr_FR.UTF-8" #ifdef __linux__