[libcxx] [test] Fix the get/put long_double_zh_CN tests on Windows

[• Quuxplusone]

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp

72–78

Naming nit: By the time I saw it again below, I'd forgotten that curr_text stood for currency_name and not current_string. I suggest spelling out currency_{symbol,name}, or even better, refactoring into a helper function as you suggest in your PR summary.

As in the previous PR, using a MultiStringType helper will eliminate the need for curr_x and w_curr_x to coexist.

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp

83

I suggest that this could be expressed as std::string(7 - curr_text.size(), ' ') and then inlined everywhere it's used. The name pad20 is awkward in that this string definitely isn't 20 bytes long. :)

[mstorsjo]

Applied most of the suggestions; renamed variables for clarity, using a locale helper for the symbol, inlined the padding string expansion.

Still using separate variables for currency_symbol instead of inlineing the call to the multistring locale helper, because there's no operator for e.g. operator+(MultiString, const char*) that would reduce the multistring implicitly to the desired string type. Using ifdefs for the definition of the international name with/without trailing space.

[Mordante]

Thanks for this improvement, please update the summary.
In general LGTM, but I would like to consider the duplication before approving.

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp

151

I'm not too fond of std::string(7 - currency_symbol.size(), ' ') duplicated a lot of times.
@Quuxplusone, @mstorsjo How about making one padding variable without 20 in the name and use that?
(I know Arthur asked this change, just want to confirm both of you like the way it looks now.)

[mstorsjo]

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp

151

I'm totally ok with e.g. std::string currency_symbol_padding = std::string(7 - currency_symbol.size(), ' '); and using that instead - that would indeed make it less cluttered. (That's what I would prefer here actually, but I'm ok with whatever you guys prefer.)

[mstorsjo]

Rebased on latest main, moved the padding back to a variable for brevity.

[• Quuxplusone]

LGTM

libcxx/test/support/locale_helpers.h

91–93

Not a blocker; maybe I just like Unicode character names too much. ;)

[mstorsjo]

libcxx/test/support/locale_helpers.h

91–93

Sure, will amend that. (I actually considered adding such comments to begin with, but I didn't find a good reference for the character names with a couple minutes of browsing.)

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // NetBSD does not support LC_MONETARY at the moment
 // XFAIL: netbsd
 
-// XFAIL: LIBCXX-WINDOWS-FIXME
 // XFAIL: LIBCXX-AIX-FIXME
 
 // REQUIRES: locale.zh_CN.UTF-8
 
 // <locale>
 
 // class money_get<charT, InputIterator>
 
 // iter_type get(iter_type b, iter_type e, bool intl, ios_base& iob,
 //               ios_base::iostate& err, long double& v) const;
 
 // TODO For zh_CN GLIBC puts the negative sign after the currency symbol.
 // XFAIL: target={{.*}}-linux-gnu{{.*}}
 
 #include <locale>
 #include <ios>
 #include <streambuf>
 #include <cassert>
 #include "test_macros.h"
 #include "test_iterators.h"
 
+#include "locale_helpers.h"
 #include "platform_support.h" // locale name macros
 
 typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn;
 
 class my_facet
     : public Fn
 {
 public:
int main(int, char**)
     ios.imbue(std::locale(ios.getloc(),
                           new std::moneypunct_byname<char, true>(loc_name)));
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     ios.imbue(std::locale(ios.getloc(),
                           new std::moneypunct_byname<wchar_t, false>(loc_name)));
     ios.imbue(std::locale(ios.getloc(),
                           new std::moneypunct_byname<wchar_t, true>(loc_name)));
 #endif
+#ifdef _WIN32
+    std::string currency_name = "CNY";
+#else
+    std::string currency_name = "CNY ";
+#endif
+    std::string currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
     {
         const my_facet f(1);
         // char, national
         {   // zero
             std::string v = "0.00";
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
std::string currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
         }
         {   // zero, showbase
-            std::string v = "\xEF\xBF\xA5""0.00";
+            std::string v = currency_symbol + "0.00";
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
         }
         {   // zero, showbase
-            std::string v = "\xEF\xBF\xA5""0.00";
+            std::string v = currency_symbol + "0.00";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
             std::noshowbase(ios);
         }
         {   // negative one, showbase
-            std::string v = "\xEF\xBF\xA5""-0.01";
+            std::string v = currency_symbol + "-0.01";
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
         }
         {   // negative one, showbase
-            std::string v = "\xEF\xBF\xA5""-0.01";
+            std::string v = currency_symbol + "-0.01";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
             std::noshowbase(ios);
         }
         {   // positive, showbase
-            std::string v = "\xEF\xBF\xA5""1,234,567.89";
+            std::string v = currency_symbol + "1,234,567.89";
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
         }
         {   // positive, showbase
-            std::string v = "\xEF\xBF\xA5""1,234,567.89";
+            std::string v = currency_symbol + "1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::string v = "\xEF\xBF\xA5""-1,234,567.89";
+            std::string v = currency_symbol + "-1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
std::string currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
         }
         {   // zero, showbase
-            std::string v = "CNY 0.00";
+            std::string v = currency_name + "0.00";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
             std::noshowbase(ios);
         }
         {   // negative one, showbase
-            std::string v = "CNY -0.01";
+            std::string v = currency_name + "-0.01";
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
         }
         {   // negative one, showbase
-            std::string v = "CNY -0.01";
+            std::string v = currency_name + "-0.01";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
             std::noshowbase(ios);
         }
         {   // positive, showbase
-            std::string v = "CNY 1,234,567.89";
+            std::string v = currency_name + "1,234,567.89";
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
         }
         {   // positive, showbase
-            std::string v = "CNY 1,234,567.89";
+            std::string v = currency_name + "1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::string v = "CNY -1,234,567.89";
+            std::string v = currency_name + "-1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::string v = "\xEF\xBF\xA5""-1,234,567.89";
+            std::string v = currency_symbol + "-1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + 0);
             assert(err == std::ios_base::failbit);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::string v = "\xEF\xBF\xA5""-1,234,567.89";
+            std::string v = currency_symbol + "-1,234,567.89";
             typedef cpp17_input_iterator<const char*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + 0);
             assert(err == std::ios_base::failbit);
         }
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
+#ifdef _WIN32
+    std::wstring w_currency_name = L"CNY";
+#else
+    std::wstring w_currency_name = L"CNY ";
+#endif
+    std::wstring w_currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
     {
         const my_facetw f(1);
         // wchar_t, national
         {   // zero
             std::wstring v = L"0.00";
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
std::wstring w_currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
         }
         {   // zero, showbase
-            std::wstring v = L"\xFFE5""0.00";
+            std::wstring v = w_currency_symbol + L"0.00";
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
         }
         {   // zero, showbase
-            std::wstring v = L"\xFFE5""0.00";
+            std::wstring v = w_currency_symbol + L"0.00";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
             std::noshowbase(ios);
         }
         {   // negative one, showbase
-            std::wstring v = L"\xFFE5""-0.01";
+            std::wstring v = w_currency_symbol + L"-0.01";
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
         }
         {   // negative one, showbase
-            std::wstring v = L"\xFFE5""-0.01";
+            std::wstring v = w_currency_symbol + L"-0.01";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
             std::noshowbase(ios);
         }
         {   // positive, showbase
-            std::wstring v = L"\xFFE5""1,234,567.89";
+            std::wstring v = w_currency_symbol + L"1,234,567.89";
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
         }
         {   // positive, showbase
-            std::wstring v = L"\xFFE5""1,234,567.89";
+            std::wstring v = w_currency_symbol + L"1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"\xFFE5""-1,234,567.89";
+            std::wstring v = w_currency_symbol + L"-1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
std::wstring w_currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
         }
         {   // zero, showbase
-            std::wstring v = L"CNY 0.00";
+            std::wstring v = w_currency_name + L"0.00";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
             std::noshowbase(ios);
         }
         {   // negative one, showbase
-            std::wstring v = L"CNY -0.01";
+            std::wstring v = w_currency_name + L"-0.01";
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
         }
         {   // negative one, showbase
-            std::wstring v = L"CNY -0.01";
+            std::wstring v = w_currency_name + L"-0.01";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
             std::noshowbase(ios);
         }
         {   // positive, showbase
-            std::wstring v = L"CNY 1,234,567.89";
+            std::wstring v = w_currency_name + L"1,234,567.89";
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
         }
         {   // positive, showbase
-            std::wstring v = L"CNY 1,234,567.89";
+            std::wstring v = w_currency_name + L"1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"CNY -1,234,567.89";
+            std::wstring v = w_currency_name + L"-1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"\xFFE5""-1,234,567.89";
+            std::wstring v = w_currency_symbol + L"-1,234,567.89";
             std::showbase(ios);
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + 0);
             assert(err == std::ios_base::failbit);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"\xFFE5""-1,234,567.89";
+            std::wstring v = w_currency_symbol + L"-1,234,567.89";
             typedef cpp17_input_iterator<const wchar_t*> I;
             long double ex;
             std::ios_base::iostate err = std::ios_base::goodbit;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(base(iter) == v.data() + 0);
             assert(err == std::ios_base::failbit);
         }
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
   return 0;
 }

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // NetBSD does not support LC_MONETARY at the moment
 // XFAIL: netbsd
 
-// XFAIL: LIBCXX-WINDOWS-FIXME
 // XFAIL: LIBCXX-AIX-FIXME
 
 // REQUIRES: locale.zh_CN.UTF-8
 
 // <locale>
 
 // class money_put<charT, OutputIterator>
 
 // iter_type put(iter_type s, bool intl, ios_base& f, char_type fill,
 //               long double units) const;
 
 // TODO For zh_CN GLIBC puts the negative sign after the currency symbol.
 // XFAIL: target={{.*}}-linux-gnu{{.*}}
 
 #include <locale>
 #include <ios>
 #include <streambuf>
 #include <cassert>
 #include "test_macros.h"
 #include "test_iterators.h"
 
+#include "locale_helpers.h"
 #include "platform_support.h" // locale name macros
 
 typedef std::money_put<char, cpp17_output_iterator<char*> > Fn;
 
 class my_facet
     : public Fn
 {
 public:

 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     ios.imbue(std::locale(ios.getloc(),
                           new std::moneypunct_byname<wchar_t, false>(loc_name)));
     ios.imbue(std::locale(ios.getloc(),
                           new std::moneypunct_byname<wchar_t, true>(loc_name)));
 #endif
 {
     const my_facet f(1);
+#ifdef _WIN32
+    std::string currency_name = "CNY";
+#else
+    std::string currency_name = "CNY ";
+#endif
+    std::string currency_name_padding(7 - currency_name.size(), ' ');
+    std::string currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
+    std::string currency_symbol_padding(7 - currency_symbol.size(), ' ');
     // char, national
     {   // zero
         long double v = 0;
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, base(iter));
         assert(ex == "0.00");
     }
     {   // negative one
         long double v = -1;
// char, national
         assert(ex == "-1,234,567.89");
     }
     {   // zero, showbase
         long double v = 0;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "\xEF\xBF\xA5""0.00");
+        assert(ex == currency_symbol + "0.00");
     }
     {   // negative one, showbase
         long double v = -1;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "\xEF\xBF\xA5""-0.01");
+        assert(ex == currency_symbol + "-0.01");
     }
     {   // positive, showbase
         long double v = 123456789;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "\xEF\xBF\xA5""1,234,567.89");
+        assert(ex == currency_symbol + "1,234,567.89");
     }
     {   // negative, showbase
         long double v = -123456789;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "\xEF\xBF\xA5""-1,234,567.89");
+        assert(ex == currency_symbol + "-1,234,567.89");
     }
     {   // negative, showbase, left
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::left(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, base(iter));
-        assert(ex == "\xEF\xBF\xA5""-1,234,567.89    ");
+        assert(ex == currency_symbol + "-1,234,567.89" + currency_symbol_padding);
         assert(ios.width() == 0);
     }
     {   // negative, showbase, internal
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::internal(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, base(iter));
-        assert(ex == "\xEF\xBF\xA5""-    1,234,567.89");
+        assert(ex == currency_symbol + "-" + currency_symbol_padding + "1,234,567.89");
         assert(ios.width() == 0);
     }
     {   // negative, showbase, right
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::right(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, base(iter));
-        assert(ex == "    \xEF\xBF\xA5""-1,234,567.89");
+        assert(ex == currency_symbol_padding + currency_symbol + "-1,234,567.89");
         assert(ios.width() == 0);
     }
 
     // char, international
     std::noshowbase(ios);
     ios.unsetf(std::ios_base::adjustfield);
     {   // zero
         long double v = 0;
ios.unsetf(std::ios_base::adjustfield);
         assert(ex == "-1,234,567.89");
     }
     {   // zero, showbase
         long double v = 0;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "CNY 0.00");
+        assert(ex == currency_name + "0.00");
     }
     {   // negative one, showbase
         long double v = -1;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "CNY -0.01");
+        assert(ex == currency_name + "-0.01");
     }
     {   // positive, showbase
         long double v = 123456789;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "CNY 1,234,567.89");
+        assert(ex == currency_name + "1,234,567.89");
     }
     {   // negative, showbase
         long double v = -123456789;
         std::showbase(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, base(iter));
-        assert(ex == "CNY -1,234,567.89");
+        assert(ex == currency_name + "-1,234,567.89");
     }
     {   // negative, showbase, left
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::left(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, base(iter));
-        assert(ex == "CNY -1,234,567.89   ");
+        assert(ex == currency_name + "-1,234,567.89" + currency_name_padding);
         assert(ios.width() == 0);
     }
     {   // negative, showbase, internal
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::internal(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, base(iter));
-        assert(ex == "CNY -   1,234,567.89");
+        assert(ex == currency_name + "-" + currency_name_padding + "1,234,567.89");
         assert(ios.width() == 0);
     }
     {   // negative, showbase, right
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::right(ios);
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, base(iter));
-        assert(ex == "   CNY -1,234,567.89");
+        assert(ex == currency_name_padding + currency_name + "-1,234,567.89");
         assert(ios.width() == 0);
     }
 }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
 {
+#ifdef _WIN32
+    std::wstring currency_name = L"CNY";
+#else
+    std::wstring currency_name = L"CNY ";
+#endif
+    std::wstring currency_name_padding(7 - currency_name.size(), ' ');
+    std::wstring currency_symbol(LocaleHelpers::currency_symbol_zh_CN());
     const my_facetw f(1);
     // wchar_t, national
     std::noshowbase(ios);
     ios.unsetf(std::ios_base::adjustfield);
     {   // zero
         long double v = 0;
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
ios.unsetf(std::ios_base::adjustfield);
         assert(ex == L"-1,234,567.89");
     }
     {   // zero, showbase
         long double v = 0;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"\xFFE5""0.00");
+        assert(ex == currency_symbol + L"0.00");
     }
     {   // negative one, showbase
         long double v = -1;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"\xFFE5""-0.01");
+        assert(ex == currency_symbol + L"-0.01");
     }
     {   // positive, showbase
         long double v = 123456789;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"\xFFE5""1,234,567.89");
+        assert(ex == currency_symbol + L"1,234,567.89");
     }
     {   // negative, showbase
         long double v = -123456789;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"\xFFE5""-1,234,567.89");
+        assert(ex == currency_symbol + L"-1,234,567.89");
     }
     {   // negative, showbase, left
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::left(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"\xFFE5""-1,234,567.89      ");
+        assert(ex == currency_symbol + L"-1,234,567.89      ");
         assert(ios.width() == 0);
     }
     {   // negative, showbase, internal
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::internal(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"\xFFE5""-      1,234,567.89");
+        assert(ex == currency_symbol + L"-      1,234,567.89");
         assert(ios.width() == 0);
     }
     {   // negative, showbase, right
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::right(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"      \xFFE5""-1,234,567.89");
+        assert(ex == L"      " + currency_symbol + L"-1,234,567.89");
         assert(ios.width() == 0);
     }
 
     // wchar_t, international
     std::noshowbase(ios);
     ios.unsetf(std::ios_base::adjustfield);
     {   // zero
         long double v = 0;
ios.unsetf(std::ios_base::adjustfield);
         assert(ex == L"-1,234,567.89");
     }
     {   // zero, showbase
         long double v = 0;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"CNY 0.00");
+        assert(ex == currency_name + L"0.00");
     }
     {   // negative one, showbase
         long double v = -1;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"CNY -0.01");
+        assert(ex == currency_name + L"-0.01");
     }
     {   // positive, showbase
         long double v = 123456789;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"CNY 1,234,567.89");
+        assert(ex == currency_name + L"1,234,567.89");
     }
     {   // negative, showbase
         long double v = -123456789;
         std::showbase(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"CNY -1,234,567.89");
+        assert(ex == currency_name + L"-1,234,567.89");
     }
     {   // negative, showbase, left
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::left(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"CNY -1,234,567.89   ");
+        assert(ex == currency_name + L"-1,234,567.89" + currency_name_padding);
         assert(ios.width() == 0);
     }
     {   // negative, showbase, internal
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::internal(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"CNY -   1,234,567.89");
+        assert(ex == currency_name + L"-" + currency_name_padding + L"1,234,567.89");
         assert(ios.width() == 0);
     }
     {   // negative, showbase, right
         long double v = -123456789;
         std::showbase(ios);
         ios.width(20);
         std::right(ios);
         wchar_t str[100];
         cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, base(iter));
-        assert(ex == L"   CNY -1,234,567.89");
+        assert(ex == currency_name_padding + currency_name + L"-1,234,567.89");
         assert(ios.width() == 0);
     }
 }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
   return 0;
 }

libcxx/test/support/locale_helpers.h

else
     return MKSTR("\u20BD"); // U+20BD RUBLE SIGN
 #elif defined(_WIN32) || defined(__FreeBSD__)
   return MKSTR("\u20BD"); // U+20BD RUBLE SIGN
 #else
   return MKSTR("\u0440\u0443\u0431.");
 #endif
 }
 
+MultiStringType currency_symbol_zh_CN() {
+#if defined(_WIN32)
+  return MKSTR("\u00A5"); // U+00A5 YEN SIGN
+#else
+  return MKSTR("\uFFE5"); // U+FFE5 FULLWIDTH YEN SIGN
+#endif
+}
+
 } // namespace LocaleHelpers
 
 #endif // LIBCXX_TEST_SUPPORT_LOCALE_HELPERS_H