diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp index ca5b6736f3272..3243db6a5cca6 100644 --- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp @@ -89,27 +89,22 @@ int main(int, char**) } #endif -#if defined( _WIN32) || defined(_AIX) - std::string us_grouping = "\3"; -#else - std::string us_grouping = "\3\3"; -#endif { Fnf f(LOCALE_en_US_UTF_8, 1); - assert(f.grouping() == us_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } { Fnt f(LOCALE_en_US_UTF_8, 1); - assert(f.grouping() == us_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } #ifndef TEST_HAS_NO_WIDE_CHARACTERS { Fwf f(LOCALE_en_US_UTF_8, 1); - assert(f.grouping() == us_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } { Fwt f(LOCALE_en_US_UTF_8, 1); - assert(f.grouping() == us_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } #endif @@ -132,27 +127,22 @@ int main(int, char**) } #endif -#if defined( _WIN32) || defined(_AIX) - std::string ru_grouping = "\3"; -#else - std::string ru_grouping = "\3\3"; -#endif { Fnf f(LOCALE_ru_RU_UTF_8, 1); - assert(f.grouping() == ru_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } { Fnt f(LOCALE_ru_RU_UTF_8, 1); - assert(f.grouping() == ru_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } #ifndef TEST_HAS_NO_WIDE_CHARACTERS { Fwf f(LOCALE_ru_RU_UTF_8, 1); - assert(f.grouping() == ru_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } { Fwt f(LOCALE_ru_RU_UTF_8, 1); - assert(f.grouping() == ru_grouping); + assert(f.grouping() == "\3" || f.grouping() == "\3\3"); } #endif diff --git a/libcxx/test/std/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp b/libcxx/test/std/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp index 86c447d400aaa..1e68bb3967f0f 100644 --- a/libcxx/test/std/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp @@ -48,21 +48,13 @@ int main(int, char**) { typedef char C; const std::numpunct& np = std::use_facet >(l); -#if defined(_WIN32) || defined(_AIX) - assert(np.grouping() == "\3"); -#else - assert(np.grouping() == "\3\3"); -#endif + assert(np.grouping() == "\3" || np.grouping() == "\3\3"); } #ifndef TEST_HAS_NO_WIDE_CHARACTERS { typedef wchar_t C; const std::numpunct& np = std::use_facet >(l); -# if defined(_WIN32) || defined(_AIX) - assert(np.grouping() == "\3"); -# else - assert(np.grouping() == "\3\3"); -# endif + assert(np.grouping() == "\3" || np.grouping() == "\3\3"); } #endif }