From 092a73b9ae5b9014ba017ac573295770febfbcaa Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Tue, 10 Dec 2024 14:10:56 -0800 Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20in?= =?UTF-8?q?itial=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.4 --- .../grouping.pass.cpp | 27 +++++++------------ .../locale.numpunct.byname/grouping.pass.cpp | 12 ++------- 2 files changed, 11 insertions(+), 28 deletions(-) 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..6f23d444f2fe9 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 @@ -24,6 +24,7 @@ // string grouping() const; +#include #include #include #include @@ -89,27 +90,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 +128,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 } From 0743c83915f905c0d456a0e32f95a964cfa6fde0 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Thu, 12 Dec 2024 18:05:16 -0800 Subject: [PATCH 2/2] Remove include added for debugging --- .../category.monetary/locale.moneypunct.byname/grouping.pass.cpp | 1 - 1 file changed, 1 deletion(-) 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 6f23d444f2fe9..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 @@ -24,7 +24,6 @@ // string grouping() const; -#include #include #include #include