[libcxx] [test] Fix get/put long_double_ru_RU on Glibc, FreeBSD and Windows

[mstorsjo]

Summary

Note, reducing ios.width() in put_long_double instead of using variable
padding, when using a variable width symbol. Some of those tests didn't
actually trigger any padding in the existing form, with a longer
currency symbol; reduce the width so there's no actual padding with the
slightly shorter currency symbol either.

The tests for the international currency symbol use the same amount of
padding on all platforms, so they still exercise the padding properly.

[Mordante]

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

54

Would it make sense to move this function to a helper header and share the code between the two tests?

57

Please reduce the scope to the loop.
Please use a lower case i.

62

std::iswdigit requires <cwctype>.

[mstorsjo]

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

54

I guess that could be done - we have the same in the get/put long_double fr_FR tests too (but with slightly different constellation of separators across systems). Do you have a suggestion on where to place it?

57

Ok, can do. This is based on copypaste from the existing fr_FR tests though. But if we move the helper out somewhere, we could do the same cleanup at the same time.

62

Thanks, good catch!

[mstorsjo]

Sharing the convert_thousands_sep helper function in a new header, locale_helpers.h, across {get,put}_long_double_{fr_FR,ru_RU} tests.

[mstorsjo]

Trying to fix failures in the no-wchar configuration.

[Mordante]

LGTM!

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

54

I would suggest under test/support, but I see you already did that.

[• Quuxplusone]

No strong objection to it as-is, but I think there are improvements possible.

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

74

Consider whether this can be simply

std::string symbol = "\u20BD";
~~~
std::string symbol = "\u0440\u0443\u0431.";

408–410

As above, can this use \u instead of \x?

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

73–75

As above. I'm also starting to wonder if you now have a convenient place to hang LocaleHelpers::russian_currency_symbol(). :)
(Or currency_symbol_ru_RU() or whatever naming convention you like.)

[mstorsjo]

Factorize the platform differences for the currency symbol from the curr_symbol test into LocaleHelpers, use unicode code points instead of individual utf8 bytes in the strings.

[mstorsjo]

Fixed the no-wide-chars configuration.

[• Quuxplusone]

Let's do one more round, just to see if MultiStringType is useful.

libcxx/test/support/locale_helpers.h

75

I wonder if you could use MultiStringType instead of std::string here, and then you wouldn't need to repeat yourself on lines 90-108.

77–83

The comments are just repeating what the code says.
(The only reason I don't also comment on the "\u0440\u0443\u0431" line is that I can't think of a short yet enlightening comment to put, except for // "руб", and I don't want to encourage non-ASCII comments.)

[mstorsjo]

Factorize currency_symbol_ru_RU() to use MultiStringType, applied the suggested cleanups (removing redundant comments, adding unicode char explanations).

[• Quuxplusone]

LGTM % one last comment! I think MultiStringType really cleaned it up nicely.

libcxx/test/support/locale_helpers.h

49–55

I think this will be easier to grok. (It follows the same pattern as lines 76-83 below.)

[mstorsjo]

Fix the use of MultiString in the curr_symbol testcase.

[uabelho]

Hello,

I see the following failures with this commit:

FAIL: libc++ :: std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp (466 of 7808)
******************** TEST 'libc++ :: std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp' FAILED ********************
Script:
--
: 'COMPILED WITH';  /repo/uabelho/master-github/llvm/build-all-builtins/./bin/clang++ /repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp -v --target=x86_64-unknown-linux-gnu -nostdinc++ -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1 -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1 -I/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -I/repo/uabelho/master-github/libcxx/test/support -std=c++2b -Werror -Wall -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-user-defined-literals -Wno-noexcept-type -Wno-atomic-alignment -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -D_LIBCPP_DISABLE_AVAILABILITY -fcoroutines-ts -Werror=thread-safety -Wuser-defined-warnings -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER  -lc++experimental -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -nodefaultlibs -lc++ -lm -lgcc_s -lgcc -lpthread -lc -lgcc_s -lgcc -latomic -o /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Output/get_long_double_ru_RU.pass.cpp.dir/t.tmp.exe
: 'EXECUTED AS';  "/app/vbuild/RHEL7-x86_64/python/3.8.0/bin/python3.8" /repo/uabelho/master-github/libcxx/test/../utils/run.py --execdir /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Output/get_long_double_ru_RU.pass.cpp.dir --codesign_identity "" --env  --  /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Output/get_long_double_ru_RU.pass.cpp.dir/t.tmp.exe
--
Exit Code: 250

Command Output (stdout):
--
$ ":" "COMPILED WITH"
note: command had no output on stdout or stderr
$ "/repo/uabelho/master-github/llvm/build-all-builtins/./bin/clang++" "/repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp" "-v" "--target=x86_64-unknown-linux-gnu" "-nostdinc++" "-isystem" "/repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1" "-isystem" "/repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1" "-I/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build" "-D__STDC_FORMAT_MACROS" "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS" "-I/repo/uabelho/master-github/libcxx/test/support" "-std=c++2b" "-Werror" "-Wall" "-Wextra" "-Wshadow" "-Wundef" "-Wno-unused-command-line-argument" "-Wno-attributes" "-Wno-pessimizing-move" "-Wno-c++11-extensions" "-Wno-user-defined-literals" "-Wno-noexcept-type" "-Wno-atomic-alignment" "-Wsign-compare" "-Wunused-variable" "-Wunused-parameter" "-Wunreachable-code" "-Wno-unused-local-typedef" "-D_LIBCPP_DISABLE_AVAILABILITY" "-fcoroutines-ts" "-Werror=thread-safety" "-Wuser-defined-warnings" "-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER" "-lc++experimental" "-L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-nodefaultlibs" "-lc++" "-lm" "-lgcc_s" "-lgcc" "-lpthread" "-lc" "-lgcc_s" "-lgcc" "-latomic" "-o" "/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Output/get_long_double_ru_RU.pass.cpp.dir/t.tmp.exe"
# command stderr:
clang version 15.0.0
Target: x86_64-unknown-linux-gnu
Thread model: posix
InstalledDir: /repo/uabelho/master-github/llvm/build-all-builtins/./bin
Found candidate GCC installation: /usr/lib/gcc/i686-redhat-linux/4.8.2
Found candidate GCC installation: /usr/lib/gcc/i686-redhat-linux/4.8.5
Found candidate GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.2
Found candidate GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.5
Selected GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.5
Candidate multilib: .;@m64
Candidate multilib: 32;@m32
Selected multilib: .;@m64
 "/repo/uabelho/master-github/llvm/build-all-builtins/bin/clang-15" -cc1 -triple x86_64-unknown-linux-gnu -emit-obj -mrelax-all --mrelax-relocations -disable-free -clear-ast-before-backend -main-file-name get_long_double_ru_RU.pass.cpp -mrelocation-model static -mframe-pointer=all -fmath-errno -ffp-contract=on -fno-rounding-math -mconstructor-aliases -funwind-tables=2 -target-cpu x86-64 -tune-cpu generic -mllvm -treat-scalable-fixed-error-as-warning -debugger-tuning=gdb -v -fcoverage-compilation-dir=/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members -nostdinc++ -resource-dir /repo/uabelho/master-github/llvm/build-all-builtins/lib/clang/15.0.0 -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1 -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1 -I /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build -D __STDC_FORMAT_MACROS -D __STDC_LIMIT_MACROS -D __STDC_CONSTANT_MACROS -I /repo/uabelho/master-github/libcxx/test/support -D _LIBCPP_DISABLE_AVAILABILITY -D _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -internal-isystem /repo/uabelho/master-github/llvm/build-all-builtins/lib/clang/15.0.0/include -internal-isystem /usr/local/include -internal-isystem /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../x86_64-redhat-linux/include -internal-externc-isystem /include -internal-externc-isystem /usr/include -Werror -Wall -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-user-defined-literals -Wno-noexcept-type -Wno-atomic-alignment -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -Werror=thread-safety -Wuser-defined-warnings -std=c++2b -fdeprecated-macro -fdebug-compilation-dir=/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members -ferror-limit 19 -fcoroutines-ts -fgnuc-version=4.2.1 -fcxx-exceptions -fexceptions -faddrsig -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o /tmp/lit-tmp-h6axl3wy/get_long_double_ru_RU-0c1264.o -x c++ /repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
clang -cc1 version 15.0.0 based upon LLVM 15.0.0git default target x86_64-unknown-linux-gnu
ignoring nonexistent directory "/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../x86_64-redhat-linux/include"
ignoring nonexistent directory "/include"
#include "..." search starts here:
#include <...> search starts here:
 /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build
 /repo/uabelho/master-github/libcxx/test/support
 /repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1
 /repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1
 /repo/uabelho/master-github/llvm/build-all-builtins/lib/clang/15.0.0/include
 /usr/local/include
 /usr/include
End of search list.
 "/proj/flexasic/app/llvm/8.0/bin/ld" --hash-style=gnu --eh-frame-hdr -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -o /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Output/get_long_double_ru_RU.pass.cpp.dir/t.tmp.exe /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crt1.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtbegin.o -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -L/repo/uabelho/master-github/llvm/build-all-builtins/bin/../lib/x86_64-unknown-linux-gnu -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/repo/uabelho/master-github/llvm/build-all-builtins/bin/../lib -L/lib -L/usr/lib /tmp/lit-tmp-h6axl3wy/get_long_double_ru_RU-0c1264.o -lc++experimental -rpath /repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -rpath /repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -lc++ -lm -lgcc_s -lgcc -lpthread -lc -lgcc_s -lgcc -latomic /usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtend.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crtn.o

$ ":" "EXECUTED AS"
note: command had no output on stdout or stderr
$ "/app/vbuild/RHEL7-x86_64/python/3.8.0/bin/python3.8" "/repo/uabelho/master-github/libcxx/test/../utils/run.py" "--execdir" "/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Output/get_long_double_ru_RU.pass.cpp.dir" "--codesign_identity" "" "--env" "--" "/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Output/get_long_double_ru_RU.pass.cpp.dir/t.tmp.exe"
# command stderr:
t.tmp.exe: /repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp:82: int main(int, char **): Assertion `iter.base() == v.data() + v.size()' failed.

error: command failed with exit status: 250

--

********************
FAIL: libc++ :: std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp (855 of 7808)
******************** TEST 'libc++ :: std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp' FAILED ********************
Script:
--
: 'COMPILED WITH';  /repo/uabelho/master-github/llvm/build-all-builtins/./bin/clang++ /repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp -v --target=x86_64-unknown-linux-gnu -nostdinc++ -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1 -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1 -I/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -I/repo/uabelho/master-github/libcxx/test/support -std=c++2b -Werror -Wall -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-user-defined-literals -Wno-noexcept-type -Wno-atomic-alignment -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -D_LIBCPP_DISABLE_AVAILABILITY -fcoroutines-ts -Werror=thread-safety -Wuser-defined-warnings -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER  -lc++experimental -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -nodefaultlibs -lc++ -lm -lgcc_s -lgcc -lpthread -lc -lgcc_s -lgcc -latomic -o /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Output/put_long_double_ru_RU.pass.cpp.dir/t.tmp.exe
: 'EXECUTED AS';  "/app/vbuild/RHEL7-x86_64/python/3.8.0/bin/python3.8" /repo/uabelho/master-github/libcxx/test/../utils/run.py --execdir /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Output/put_long_double_ru_RU.pass.cpp.dir --codesign_identity "" --env  --  /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Output/put_long_double_ru_RU.pass.cpp.dir/t.tmp.exe
--
Exit Code: 250

Command Output (stdout):
--
$ ":" "COMPILED WITH"
note: command had no output on stdout or stderr
$ "/repo/uabelho/master-github/llvm/build-all-builtins/./bin/clang++" "/repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp" "-v" "--target=x86_64-unknown-linux-gnu" "-nostdinc++" "-isystem" "/repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1" "-isystem" "/repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1" "-I/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build" "-D__STDC_FORMAT_MACROS" "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS" "-I/repo/uabelho/master-github/libcxx/test/support" "-std=c++2b" "-Werror" "-Wall" "-Wextra" "-Wshadow" "-Wundef" "-Wno-unused-command-line-argument" "-Wno-attributes" "-Wno-pessimizing-move" "-Wno-c++11-extensions" "-Wno-user-defined-literals" "-Wno-noexcept-type" "-Wno-atomic-alignment" "-Wsign-compare" "-Wunused-variable" "-Wunused-parameter" "-Wunreachable-code" "-Wno-unused-local-typedef" "-D_LIBCPP_DISABLE_AVAILABILITY" "-fcoroutines-ts" "-Werror=thread-safety" "-Wuser-defined-warnings" "-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER" "-lc++experimental" "-L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-Wl,-rpath,/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu" "-nodefaultlibs" "-lc++" "-lm" "-lgcc_s" "-lgcc" "-lpthread" "-lc" "-lgcc_s" "-lgcc" "-latomic" "-o" "/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Output/put_long_double_ru_RU.pass.cpp.dir/t.tmp.exe"
# command stderr:
clang version 15.0.0
Target: x86_64-unknown-linux-gnu
Thread model: posix
InstalledDir: /repo/uabelho/master-github/llvm/build-all-builtins/./bin
Found candidate GCC installation: /usr/lib/gcc/i686-redhat-linux/4.8.2
Found candidate GCC installation: /usr/lib/gcc/i686-redhat-linux/4.8.5
Found candidate GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.2
Found candidate GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.5
Selected GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.5
Candidate multilib: .;@m64
Candidate multilib: 32;@m32
Selected multilib: .;@m64
 "/repo/uabelho/master-github/llvm/build-all-builtins/bin/clang-15" -cc1 -triple x86_64-unknown-linux-gnu -emit-obj -mrelax-all --mrelax-relocations -disable-free -clear-ast-before-backend -main-file-name put_long_double_ru_RU.pass.cpp -mrelocation-model static -mframe-pointer=all -fmath-errno -ffp-contract=on -fno-rounding-math -mconstructor-aliases -funwind-tables=2 -target-cpu x86-64 -tune-cpu generic -mllvm -treat-scalable-fixed-error-as-warning -debugger-tuning=gdb -v -fcoverage-compilation-dir=/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members -nostdinc++ -resource-dir /repo/uabelho/master-github/llvm/build-all-builtins/lib/clang/15.0.0 -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1 -isystem /repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1 -I /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build -D __STDC_FORMAT_MACROS -D __STDC_LIMIT_MACROS -D __STDC_CONSTANT_MACROS -I /repo/uabelho/master-github/libcxx/test/support -D _LIBCPP_DISABLE_AVAILABILITY -D _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -internal-isystem /repo/uabelho/master-github/llvm/build-all-builtins/lib/clang/15.0.0/include -internal-isystem /usr/local/include -internal-isystem /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../x86_64-redhat-linux/include -internal-externc-isystem /include -internal-externc-isystem /usr/include -Werror -Wall -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-user-defined-literals -Wno-noexcept-type -Wno-atomic-alignment -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -Werror=thread-safety -Wuser-defined-warnings -std=c++2b -fdeprecated-macro -fdebug-compilation-dir=/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members -ferror-limit 19 -fcoroutines-ts -fgnuc-version=4.2.1 -fcxx-exceptions -fexceptions -faddrsig -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o /tmp/lit-tmp-h6axl3wy/put_long_double_ru_RU-609d1c.o -x c++ /repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
clang -cc1 version 15.0.0 based upon LLVM 15.0.0git default target x86_64-unknown-linux-gnu
ignoring nonexistent directory "/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../x86_64-redhat-linux/include"
ignoring nonexistent directory "/include"
#include "..." search starts here:
#include <...> search starts here:
 /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/include/c++build
 /repo/uabelho/master-github/libcxx/test/support
 /repo/uabelho/master-github/llvm/build-all-builtins/include/x86_64-unknown-linux-gnu/c++/v1
 /repo/uabelho/master-github/llvm/build-all-builtins/include/c++/v1
 /repo/uabelho/master-github/llvm/build-all-builtins/lib/clang/15.0.0/include
 /usr/local/include
 /usr/include
End of search list.
 "/proj/flexasic/app/llvm/8.0/bin/ld" --hash-style=gnu --eh-frame-hdr -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -o /repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Output/put_long_double_ru_RU.pass.cpp.dir/t.tmp.exe /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crt1.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtbegin.o -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -L/repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -L/repo/uabelho/master-github/llvm/build-all-builtins/bin/../lib/x86_64-unknown-linux-gnu -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/repo/uabelho/master-github/llvm/build-all-builtins/bin/../lib -L/lib -L/usr/lib /tmp/lit-tmp-h6axl3wy/put_long_double_ru_RU-609d1c.o -lc++experimental -rpath /repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -rpath /repo/uabelho/master-github/llvm/build-all-builtins/./lib/x86_64-unknown-linux-gnu -lc++ -lm -lgcc_s -lgcc -lpthread -lc -lgcc_s -lgcc -latomic /usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtend.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crtn.o

$ ":" "EXECUTED AS"
note: command had no output on stdout or stderr
$ "/app/vbuild/RHEL7-x86_64/python/3.8.0/bin/python3.8" "/repo/uabelho/master-github/libcxx/test/../utils/run.py" "--execdir" "/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Output/put_long_double_ru_RU.pass.cpp.dir" "--codesign_identity" "" "--env" "--" "/repo/uabelho/master-github/llvm/build-all-builtins/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Output/put_long_double_ru_RU.pass.cpp.dir/t.tmp.exe"
# command stderr:
t.tmp.exe: /repo/uabelho/master-github/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp:80: int main(int, char **): Assertion `ex == "0,00"' failed.

error: command failed with exit status: 250

--

********************
********************
Failed Tests (2):
  libc++ :: std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
  libc++ :: std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp

Any idea?

[mstorsjo]

In D120317#3359172, @uabelho wrote:

Hello,

I see the following failures with this commit:

Any idea?

Sorry about that. It would seem like there are differences in the ru_RU.UTF-8 locale in your installation than in the ones used in CI and in my local environment. What glibc version are you running (as it would seem we require to selectively expect different results on different versions of glibc)?

Can you rerun the put_long_double_ru_RU.pass.cpp test with this diff applied?

diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
index ae5071907aca..a7156e78132e 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
@@ -77,6 +77,9 @@ int main(int, char**)
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, base(iter));
+        for (char c : ex)
+            fprintf(stderr, "%02x ", c);
+        fprintf(stderr, "\n");                 
         assert(ex == "0,00");
     }      
     {   // negative one

Alternatively, even better, can you provide the output of this test program:

#include <locale.h>
#include <stdio.h>

int main(int argc, char **argv) {
    const char *locale = "ru_RU.UTF-8";
    if (argc > 1)
        locale = argv[1];
    if (!setlocale(LC_ALL, locale)) {
        printf("setlocale(%s) failed\n", locale);
        return 1;
    }
    struct lconv *lconv = localeconv();
    printf("mon_thousands_sep: \"%s\",", lconv->mon_thousands_sep);
    for (const char *c = lconv->mon_thousands_sep; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("thousands_sep: \"%s\",", lconv->thousands_sep);
    for (const char *c = lconv->thousands_sep; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("int_curr_symbol: \"%s\"\n", lconv->int_curr_symbol);
    printf("currency_symbol: \"%s\",", lconv->currency_symbol);
    for (const char *c = lconv->currency_symbol; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("decimal_point: \"%s\",", lconv->decimal_point);
    for (const char *c = lconv->decimal_point; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("mon_decimal_point: \"%s\",", lconv->mon_decimal_point);
    for (const char *c = lconv->mon_decimal_point; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("negative_sign: \"%s\"\n", lconv->negative_sign);
    printf("positive_sign: \"%s\"\n", lconv->positive_sign);
    printf("n_sign_posn: %d\n", lconv->n_sign_posn);
    printf("p_sign_posn: %d\n", lconv->p_sign_posn);
#ifndef _WIN32
    printf("int_n_sign_posn: %d\n", lconv->int_n_sign_posn);
    printf("int_p_sign_posn: %d\n", lconv->int_p_sign_posn);
#endif
    return 0;
}

[uabelho]

In D120317#3359186, @mstorsjo wrote:

Sorry about that. It would seem like there are differences in the ru_RU.UTF-8 locale in your installation than in the ones used in CI and in my local environment. What glibc version are you running (as it would seem we require to selectively expect different results on different versions of glibc)?

Can you rerun the put_long_double_ru_RU.pass.cpp test with this diff applied?

diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
index ae5071907aca..a7156e78132e 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
@@ -77,6 +77,9 @@ int main(int, char**)
         char str[100];
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, base(iter));
+        for (char c : ex)
+            fprintf(stderr, "%02x ", c);
+        fprintf(stderr, "\n");                 
         assert(ex == "0,00");
     }      
     {   // negative one

Yes, I got

30 2e 30 30

Alternatively, even better, can you provide the output of this test program:

#include <locale.h>
#include <stdio.h>

int main(int argc, char **argv) {
    const char *locale = "ru_RU.UTF-8";
    if (argc > 1)
        locale = argv[1];
    if (!setlocale(LC_ALL, locale)) {
        printf("setlocale(%s) failed\n", locale);
        return 1;
    }
    struct lconv *lconv = localeconv();
    printf("mon_thousands_sep: \"%s\",", lconv->mon_thousands_sep);
    for (const char *c = lconv->mon_thousands_sep; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("thousands_sep: \"%s\",", lconv->thousands_sep);
    for (const char *c = lconv->thousands_sep; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("int_curr_symbol: \"%s\"\n", lconv->int_curr_symbol);
    printf("currency_symbol: \"%s\",", lconv->currency_symbol);
    for (const char *c = lconv->currency_symbol; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("decimal_point: \"%s\",", lconv->decimal_point);
    for (const char *c = lconv->decimal_point; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("mon_decimal_point: \"%s\",", lconv->mon_decimal_point);
    for (const char *c = lconv->mon_decimal_point; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("negative_sign: \"%s\"\n", lconv->negative_sign);
    printf("positive_sign: \"%s\"\n", lconv->positive_sign);
    printf("n_sign_posn: %d\n", lconv->n_sign_posn);
    printf("p_sign_posn: %d\n", lconv->p_sign_posn);
#ifndef _WIN32
    printf("int_n_sign_posn: %d\n", lconv->int_n_sign_posn);
    printf("int_p_sign_posn: %d\n", lconv->int_p_sign_posn);
#endif
    return 0;
}

Yep

mon_thousands_sep: " ", c2 a0
thousands_sep: " ", c2 a0
int_curr_symbol: "RUB "
currency_symbol: "руб", d1 80 d1 83 d0 b1
decimal_point: ",", 2c
mon_decimal_point: ".", 2e
negative_sign: "-"
positive_sign: ""
n_sign_posn: 1
p_sign_posn: 1
int_n_sign_posn: 1
int_p_sign_posn: 1

[mstorsjo]

In D120317#3359301, @uabelho wrote:

Alternatively, even better, can you provide the output of this test program:

#include <locale.h>
#include <stdio.h>

int main(int argc, char **argv) {
    const char *locale = "ru_RU.UTF-8";
    if (argc > 1)
        locale = argv[1];
    if (!setlocale(LC_ALL, locale)) {
        printf("setlocale(%s) failed\n", locale);
        return 1;
    }
    struct lconv *lconv = localeconv();
    printf("mon_thousands_sep: \"%s\",", lconv->mon_thousands_sep);
    for (const char *c = lconv->mon_thousands_sep; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("thousands_sep: \"%s\",", lconv->thousands_sep);
    for (const char *c = lconv->thousands_sep; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("int_curr_symbol: \"%s\"\n", lconv->int_curr_symbol);
    printf("currency_symbol: \"%s\",", lconv->currency_symbol);
    for (const char *c = lconv->currency_symbol; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("decimal_point: \"%s\",", lconv->decimal_point);
    for (const char *c = lconv->decimal_point; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("mon_decimal_point: \"%s\",", lconv->mon_decimal_point);
    for (const char *c = lconv->mon_decimal_point; *c; c++)
        printf(" %02x", (unsigned char)*c);
    printf("\n");
    printf("negative_sign: \"%s\"\n", lconv->negative_sign);
    printf("positive_sign: \"%s\"\n", lconv->positive_sign);
    printf("n_sign_posn: %d\n", lconv->n_sign_posn);
    printf("p_sign_posn: %d\n", lconv->p_sign_posn);
#ifndef _WIN32
    printf("int_n_sign_posn: %d\n", lconv->int_n_sign_posn);
    printf("int_p_sign_posn: %d\n", lconv->int_p_sign_posn);
#endif
    return 0;
}

Yep

mon_thousands_sep: " ", c2 a0
thousands_sep: " ", c2 a0
int_curr_symbol: "RUB "
currency_symbol: "руб", d1 80 d1 83 d0 b1
decimal_point: ",", 2c
mon_decimal_point: ".", 2e
negative_sign: "-"
positive_sign: ""
n_sign_posn: 1
p_sign_posn: 1
int_n_sign_posn: 1
int_p_sign_posn: 1

Thanks! I get this:

mon_thousands_sep: " ", e2 80 af
thousands_sep: " ", e2 80 af
int_curr_symbol: "RUB "
currency_symbol: "₽", e2 82 bd
decimal_point: ",", 2c
mon_decimal_point: ",", 2c
negative_sign: "-"
positive_sign: ""
n_sign_posn: 1
p_sign_posn: 1
int_n_sign_posn: 1
int_p_sign_posn: 1

What glibc version do you have? As you're on RHEL, I would expect an older one (mine is on Ubuntu 20.04, with glibc 2.31). There seems to be differences in most fields, in particular in mon_decimal_point here. We already have some conditionals due to the fact that currency_symbol differs for ru_RU.UTF-8 in various glibc versions (apparently with the new form appearing in 2.24), but we never had any glibc conditionals for the differing mon_decimal_point. As that probably would require quite intrusive changes to the test, I guess it's probably best to make the test bail out on such older versions (as it just has been XFAILed forever on that platform before anyway).

[uabelho]

In D120317#3359332, @mstorsjo wrote:

What glibc version do you have? As you're on RHEL, I would expect an older one (mine is on Ubuntu 20.04, with glibc 2.31). There seems to be differences in most fields, in particular in mon_decimal_point here. We already have some conditionals due to the fact that currency_symbol differs for ru_RU.UTF-8 in various glibc versions (apparently with the new form appearing in 2.24), but we never had any glibc conditionals for the differing mon_decimal_point. As that probably would require quite intrusive changes to the test, I guess it's probably best to make the test bail out on such older versions (as it just has been XFAILed forever on that platform before anyway).

Seems like it 2.17. ldd on the bult binary says e.g.
libc.so.6 => /lib64/libc.so.6 (0x00007fc160eed000)
and then
-> /lib64/libc.so.6
GNU C Library (GNU libc) stable release version 2.17, by Roland McGrath et al.

[mstorsjo]

In D120317#3359350, @uabelho wrote:

In D120317#3359332, @mstorsjo wrote:

What glibc version do you have? As you're on RHEL, I would expect an older one (mine is on Ubuntu 20.04, with glibc 2.31). There seems to be differences in most fields, in particular in mon_decimal_point here. We already have some conditionals due to the fact that currency_symbol differs for ru_RU.UTF-8 in various glibc versions (apparently with the new form appearing in 2.24), but we never had any glibc conditionals for the differing mon_decimal_point. As that probably would require quite intrusive changes to the test, I guess it's probably best to make the test bail out on such older versions (as it just has been XFAILed forever on that platform before anyway).

Seems like it 2.17. ldd on the bult binary says e.g.
libc.so.6 => /lib64/libc.so.6 (0x00007fc160eed000)
and then
-> /lib64/libc.so.6
GNU C Library (GNU libc) stable release version 2.17, by Roland McGrath et al.

Thanks!

I dug around and found that this change stems from https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f11f2f6e145d6fc6b52f6b0733599f8b96595733, and that commit was part of the 2.27 release.

[uabelho]

In D120317#3359354, @mstorsjo wrote:

In D120317#3359350, @uabelho wrote:

In D120317#3359332, @mstorsjo wrote:

What glibc version do you have? As you're on RHEL, I would expect an older one (mine is on Ubuntu 20.04, with glibc 2.31). There seems to be differences in most fields, in particular in mon_decimal_point here. We already have some conditionals due to the fact that currency_symbol differs for ru_RU.UTF-8 in various glibc versions (apparently with the new form appearing in 2.24), but we never had any glibc conditionals for the differing mon_decimal_point. As that probably would require quite intrusive changes to the test, I guess it's probably best to make the test bail out on such older versions (as it just has been XFAILed forever on that platform before anyway).

Seems like it 2.17. ldd on the bult binary says e.g.
libc.so.6 => /lib64/libc.so.6 (0x00007fc160eed000)
and then
-> /lib64/libc.so.6
GNU C Library (GNU libc) stable release version 2.17, by Roland McGrath et al.

Thanks!

I dug around and found that this change stems from https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f11f2f6e145d6fc6b52f6b0733599f8b96595733, and that commit was part of the 2.27 release.

Ok! You'll make a fix for it?

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

 //               ios_base::iostate& err, long double& v) const;
 
 #include <locale>
 #include <ios>
 #include <streambuf>
 #include <cassert>
 #include "test_iterators.h"
 
+#include "locale_helpers.h"
 #include "platform_support.h" // locale name macros
 #include "test_macros.h"
 
 typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn;
 
 class my_facet
     : public Fn
 {
 public:
     explicit my_facet(std::size_t refs = 0)
         : Fn(refs) {}
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
 typedef std::money_get<wchar_t, cpp17_input_iterator<const wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
 {
 public:
     explicit my_facetw(std::size_t refs = 0)
         : Fw(refs) {}
 };
 
-// GLIBC 2.27 and newer use U+202F NARROW NO-BREAK SPACE as a thousands separator.
-// This function converts the spaces in string inputs to U+202F if need
-// be. FreeBSD's locale data also uses U+202F, since 2018.
-// Windows uses U+00A0 NO-BREAK SPACE.
 static std::wstring convert_thousands_sep(std::wstring const& in) {
-#if defined(_CS_GNU_LIBC_VERSION) || defined(__FreeBSD__) || defined(_WIN32)
-#if defined(_CS_GNU_LIBC_VERSION)
-  if (glibc_version_less_than("2.27"))
-    return in;
-#endif
-  std::wstring out;
-  unsigned I = 0;
-  bool seen_decimal = false;
-  for (; I < in.size(); ++I) {
-    if (seen_decimal || in[I] != L' ') {
-      seen_decimal |= in[I] == L',';
-      out.push_back(in[I]);
-      continue;
-    }
-    assert(in[I] == L' ');
-#if defined(_WIN32)
-    out.push_back(L'\u00A0');
-#else
-    out.push_back(L'\u202F');
-#endif
-  }
-  return out;
-#else
-  return in;
-#endif
+  return LocaleHelpers::convert_thousands_sep_fr_FR(in);
 }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
 int main(int, char**)
 {
     std::ios ios(0);
     std::string loc_name(LOCALE_fr_FR_UTF_8);
     ios.imbue(std::locale(ios.getloc(),

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.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
 
-// Failure related to GLIBC's use of U00A0 as mon_thousands_sep
-// and U002E as mon_decimal_point.
-// TODO: U00A0 should be investigated.
-// Possibly related to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=16006
-// XFAIL: linux
-
-// XFAIL: LIBCXX-WINDOWS-FIXME
-
 // REQUIRES: locale.ru_RU.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;
 
 #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:
     explicit my_facet(std::size_t refs = 0)
         : Fn(refs) {}
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
 typedef std::money_get<wchar_t, cpp17_input_iterator<const wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
 {
 public:
     explicit my_facetw(std::size_t refs = 0)
         : Fw(refs) {}
 };
-#endif
+
+static std::wstring convert_thousands_sep(std::wstring const& in) {
+  return LocaleHelpers::convert_thousands_sep_ru_RU(in);
+}
+#endif // TEST_HAS_NO_WIDE_CHARACTERS
 
 int main(int, char**)
 {
     std::ios ios(0);
     std::string loc_name(LOCALE_ru_RU_UTF_8);
     ios.imbue(std::locale(ios.getloc(),
                           new std::moneypunct_byname<char, false>(loc_name)));
     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
+    std::string symbol(LocaleHelpers::currency_symbol_ru_RU());
     {
         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()),
                                                 false, ios, err, ex);
             assert(iter.base() == v.data() + v.size());
std::string symbol(LocaleHelpers::currency_symbol_ru_RU());
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
         }
         {   // zero, showbase
-            std::string v = "0,00 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "0,00 " + symbol;
             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(iter.base() == v.data() + 5);
             assert(err == std::ios_base::goodbit);
             assert(ex == 0);
         }
         {   // zero, showbase
-            std::string v = "0,00 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "0,00 " + symbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
             std::noshowbase(ios);
         }
         {   // negative one, showbase
-            std::string v = "-0,01 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "-0,01 " + symbol;
             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(iter.base() == v.data() + 6);
             assert(err == std::ios_base::goodbit);
             assert(ex == -1);
         }
         {   // negative one, showbase
-            std::string v = "-0,01 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "-0,01 " + symbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
             std::noshowbase(ios);
         }
         {   // positive, showbase
-            std::string v = "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "1 234 567,89 " + symbol;
             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(iter.base() == v.data() + 13);
             assert(err == std::ios_base::goodbit);
             assert(ex == 123456789);
         }
         {   // positive, showbase
-            std::string v = "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "1 234 567,89 " + symbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "-1 234 567,89 " + symbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
std::string symbol(LocaleHelpers::currency_symbol_ru_RU());
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "-1 234 567,89 " + symbol;
             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(iter.base() == v.data() + 14);
             assert(err == std::ios_base::failbit);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
+            std::string v = "-1 234 567,89 " + symbol;
             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(iter.base() == v.data() + 14);
             assert(err == std::ios_base::goodbit);
             assert(ex == -123456789);
         }
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
+    std::wstring wsymbol(LocaleHelpers::currency_symbol_ru_RU());
     {
         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;
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 false, ios, err, ex);
             assert(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
         }
         {   // negative one
             std::wstring v = 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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
         }
         {   // positive
-            std::wstring v = L"1 234 567,89 ";
+            std::wstring v = convert_thousands_sep(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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
         }
         {   // negative
-            std::wstring v = L"-1 234 567,89 ";
+            std::wstring v = convert_thousands_sep(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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
         }
         {   // negative
             std::wstring v = L"-1234567,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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
         }
         {   // zero, showbase
-            std::wstring v = L"0,00 \x440\x443\x431"".";
+            std::wstring v = L"0,00 " + wsymbol;
             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(iter.base() == v.data() + 5);
             assert(err == std::ios_base::goodbit);
             assert(ex == 0);
         }
         {   // zero, showbase
-            std::wstring v = L"0,00 \x440\x443\x431"".";
+            std::wstring v = L"0,00 " + wsymbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 0);
             std::noshowbase(ios);
         }
         {   // negative one, showbase
-            std::wstring v = L"-0,01 \x440\x443\x431"".";
+            std::wstring v = L"-0,01 " + wsymbol;
             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(iter.base() == v.data() + 6);
             assert(err == std::ios_base::goodbit);
             assert(ex == -1);
         }
         {   // negative one, showbase
-            std::wstring v = L"-0,01 \x440\x443\x431"".";
+            std::wstring v = L"-0,01 " + wsymbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
             std::noshowbase(ios);
         }
         {   // positive, showbase
-            std::wstring v = L"1 234 567,89 \x440\x443\x431"".";
+            std::wstring v = convert_thousands_sep(L"1 234 567,89 ") + wsymbol;
             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(iter.base() == v.data() + 13);
             assert(err == std::ios_base::goodbit);
             assert(ex == 123456789);
         }
         {   // positive, showbase
-            std::wstring v = L"1 234 567,89 \x440\x443\x431"".";
+            std::wstring v = convert_thousands_sep(L"1 234 567,89 ") + wsymbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"-1 234 567,89 \x440\x443\x431"".";
+            std::wstring v = convert_thousands_sep(L"-1 234 567,89 ") + wsymbol;
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"-1 234 567,89 RUB";
+            std::wstring v = convert_thousands_sep(L"-1 234 567,89 RUB");
             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(iter.base() == v.data() + 14);
             assert(err == std::ios_base::failbit);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"-1 234 567,89 RUB";
+            std::wstring v = convert_thousands_sep(L"-1 234 567,89 RUB");
             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(iter.base() == v.data() + 14);
             assert(err == std::ios_base::goodbit);
             assert(ex == -123456789);
std::wstring wsymbol(LocaleHelpers::currency_symbol_ru_RU());
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
         }
         {   // positive
-            std::wstring v = L"1 234 567,89 ";
+            std::wstring v = convert_thousands_sep(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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
         }
         {   // negative
-            std::wstring v = L"-1 234 567,89 ";
+            std::wstring v = convert_thousands_sep(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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
std::wstring wsymbol(LocaleHelpers::currency_symbol_ru_RU());
             I iter = f.get(I(v.data()), I(v.data() + v.size()),
                                                 true, ios, err, ex);
             assert(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -1);
             std::noshowbase(ios);
         }
         {   // positive, showbase
-            std::wstring v = L"1 234 567,89 RUB";
+            std::wstring v = convert_thousands_sep(L"1 234 567,89 RUB");
             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(iter.base() == v.data() + 13);
             assert(err == std::ios_base::goodbit);
             assert(ex == 123456789);
         }
         {   // positive, showbase
-            std::wstring v = L"1 234 567,89 RUB";
+            std::wstring v = convert_thousands_sep(L"1 234 567,89 RUB");
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == 123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"-1 234 567,89 RUB";
+            std::wstring v = convert_thousands_sep(L"-1 234 567,89 RUB");
             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(iter.base() == v.data() + v.size());
             assert(err == std::ios_base::eofbit);
             assert(ex == -123456789);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"-1 234 567,89 \x440\x443\x431"".";
+            std::wstring v = convert_thousands_sep(L"-1 234 567,89 ") + wsymbol;
             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(iter.base() == v.data() + 14);
             assert(err == std::ios_base::failbit);
             std::noshowbase(ios);
         }
         {   // negative, showbase
-            std::wstring v = L"-1 234 567,89 \x440\x443\x431"".";
+            std::wstring v = convert_thousands_sep(L"-1 234 567,89 ") + wsymbol;
             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(iter.base() == v.data() + 14);
             assert(err == std::ios_base::goodbit);
             assert(ex == -123456789);
         }
     }
 #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_fr_FR.pass.cpp

 //               long double units) const;
 
 #include <locale>
 #include <ios>
 #include <streambuf>
 #include <cassert>
 #include "test_iterators.h"
 
+#include "locale_helpers.h"
 #include "platform_support.h" // locale name macros
 #include "test_macros.h"
 
 typedef std::money_put<char, cpp17_output_iterator<char*> > Fn;
 
 class my_facet
     : public Fn
 {
 public:
     explicit my_facet(std::size_t refs = 0)
         : Fn(refs) {}
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
 typedef std::money_put<wchar_t, cpp17_output_iterator<wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
 {
 public:
     explicit my_facetw(std::size_t refs = 0)
         : Fw(refs) {}
 };
 
-// GLIBC 2.27 and newer use U+202F NARROW NO-BREAK SPACE as a thousands separator.
-// This function converts the spaces in string inputs to U+202F if need
-// be. FreeBSD's locale data also uses U+202F, since 2018.
-// Windows uses U+00A0 NO-BREAK SPACE.
 static std::wstring convert_thousands_sep(std::wstring const& in) {
-#if defined(_CS_GNU_LIBC_VERSION) || defined(__FreeBSD__) || defined(_WIN32)
-#if defined(_CS_GNU_LIBC_VERSION)
-  if (glibc_version_less_than("2.27"))
-    return in;
-#endif
-  std::wstring out;
-  unsigned I = 0;
-  bool seen_num_start = false;
-  bool seen_decimal = false;
-  for (; I < in.size(); ++I) {
-    seen_decimal |= in[I] == L',';
-    seen_num_start |= in[I] == '-' || std::iswdigit(in[I]);
-    if (seen_decimal || !seen_num_start || in[I] != L' ') {
-      out.push_back(in[I]);
-      continue;
-    }
-    assert(in[I] == L' ');
-#if defined(_WIN32)
-    out.push_back(L'\u00A0');
-#else
-    out.push_back(L'\u202F');
-#endif
-  }
-  return out;
-#else
-  return in;
-#endif
+  return LocaleHelpers::convert_thousands_sep_fr_FR(in);
 }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
 int main(int, char**)
 {
     std::ios ios(0);
     std::string loc_name(LOCALE_fr_FR_UTF_8);
     ios.imbue(std::locale(ios.getloc(),

libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.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
 
-// Failure related to GLIBC's use of U00A0 as mon_thousands_sep
-// and U002E as mon_decimal_point.
-// TODO: U00A0 should be investigated.
-// Possibly related to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=16006
-// XFAIL: linux
-
-// XFAIL: LIBCXX-WINDOWS-FIXME
-
 // REQUIRES: locale.ru_RU.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;
 
 #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:
     explicit my_facet(std::size_t refs = 0)
         : Fn(refs) {}
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
 typedef std::money_put<wchar_t, cpp17_output_iterator<wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
 {
 public:
     explicit my_facetw(std::size_t refs = 0)
         : Fw(refs) {}
 };
-#endif
+
+static std::wstring convert_thousands_sep(std::wstring const& in) {
+  return LocaleHelpers::convert_thousands_sep_ru_RU(in);
+}
+#endif // TEST_HAS_NO_WIDE_CHARACTERS
 
 int main(int, char**)
 {
     std::ios ios(0);
     std::string loc_name(LOCALE_ru_RU_UTF_8);
     ios.imbue(std::locale(ios.getloc(),
                           new std::moneypunct_byname<char, false>(loc_name)));
     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
 {
+    std::string symbol(LocaleHelpers::currency_symbol_ru_RU());
     const my_facet f(1);
     // 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, iter.base());
         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, iter.base());
-        assert(ex == "0,00 \xD1\x80\xD1\x83\xD0\xB1"".");
+        assert(ex == "0,00 " + symbol);
     }
     {   // 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, iter.base());
-        assert(ex == "-0,01 \xD1\x80\xD1\x83\xD0\xB1"".");
+        assert(ex == "-0,01 " + symbol);
     }
     {   // 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, iter.base());
-        assert(ex == "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
+        assert(ex == "1 234 567,89 " + symbol);
     }
     {   // 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, iter.base());
-        assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
+        assert(ex == "-1 234 567,89 " + symbol);
     }
     {   // negative, showbase, left
         long double v = -123456789;
         std::showbase(ios);
-        ios.width(20);
+        ios.width(15);
         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, iter.base());
-        assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
+        assert(ex == "-1 234 567,89 " + symbol);
         assert(ios.width() == 0);
     }
     {   // negative, showbase, internal
         long double v = -123456789;
         std::showbase(ios);
-        ios.width(20);
+        ios.width(15);
         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, iter.base());
-        assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
+        assert(ex == "-1 234 567,89 " + symbol);
         assert(ios.width() == 0);
     }
     {   // negative, showbase, right
         long double v = -123456789;
         std::showbase(ios);
-        ios.width(20);
+        ios.width(15);
         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, iter.base());
-        assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
+        assert(ex == "-1 234 567,89 " + symbol);
         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);
         cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "   -1 234 567,89 RUB");
         assert(ios.width() == 0);
     }
 }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
 {
+    std::wstring symbol(LocaleHelpers::currency_symbol_ru_RU());
     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);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00");
     }
     {   // negative one
         long double v = -1;
         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, iter.base());
         assert(ex == L"-0,01");
     }
     {   // positive
         long double v = 123456789;
         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, iter.base());
-        assert(ex == L"1 234 567,89");
+        assert(ex == convert_thousands_sep(L"1 234 567,89"));
     }
     {   // negative
         long double v = -123456789;
         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, iter.base());
-        assert(ex == L"-1 234 567,89");
+        assert(ex == convert_thousands_sep(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, iter.base());
-        assert(ex == L"0,00 \x440\x443\x431"".");
+        assert(ex == L"0,00 " + symbol);
     }
     {   // 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, iter.base());
-        assert(ex == L"-0,01 \x440\x443\x431"".");
+        assert(ex == L"-0,01 " + symbol);
     }
     {   // 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, iter.base());
-        assert(ex == L"1 234 567,89 \x440\x443\x431"".");
+        assert(ex == convert_thousands_sep(L"1 234 567,89 ") + symbol);
     }
     {   // 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, iter.base());
-        assert(ex == L"-1 234 567,89 \x440\x443\x431"".");
+        assert(ex == convert_thousands_sep(L"-1 234 567,89 ") + symbol);
     }
     {   // negative, showbase, left
         long double v = -123456789;
         std::showbase(ios);
-        ios.width(20);
+        ios.width(15);
         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, iter.base());
-        assert(ex == L"-1 234 567,89 \x440\x443\x431"".  ");
+        assert(ex == convert_thousands_sep(L"-1 234 567,89 ") + symbol);
         assert(ios.width() == 0);
     }
     {   // negative, showbase, internal
         long double v = -123456789;
         std::showbase(ios);
-        ios.width(20);
+        ios.width(15);
         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, iter.base());
-        assert(ex == L"-1 234 567,89   \x440\x443\x431"".");
+        assert(ex == convert_thousands_sep(L"-1 234 567,89 ") + symbol);
         assert(ios.width() == 0);
     }
     {   // negative, showbase, right
         long double v = -123456789;
         std::showbase(ios);
-        ios.width(20);
+        ios.width(15);
         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, iter.base());
-        assert(ex == L"  -1 234 567,89 \x440\x443\x431"".");
+        assert(ex == convert_thousands_sep(L"-1 234 567,89 ") + symbol);
         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);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01");
     }
     {   // positive
         long double v = 123456789;
         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, iter.base());
-        assert(ex == L"1 234 567,89");
+        assert(ex == convert_thousands_sep(L"1 234 567,89"));
     }
     {   // negative
         long double v = -123456789;
         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, iter.base());
-        assert(ex == L"-1 234 567,89");
+        assert(ex == convert_thousands_sep(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, iter.base());
         assert(ex == L"0,00 RUB");
     }
     {   // 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, iter.base());
         assert(ex == L"-0,01 RUB");
     }
     {   // 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, iter.base());
-        assert(ex == L"1 234 567,89 RUB");
+        assert(ex == convert_thousands_sep(L"1 234 567,89 RUB"));
     }
     {   // 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, iter.base());
-        assert(ex == L"-1 234 567,89 RUB");
+        assert(ex == convert_thousands_sep(L"-1 234 567,89 RUB"));
     }
     {   // 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, iter.base());
-        assert(ex == L"-1 234 567,89 RUB   ");
+        assert(ex == convert_thousands_sep(L"-1 234 567,89 RUB   "));
         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, iter.base());
-        assert(ex == L"-1 234 567,89    RUB");
+        assert(ex == convert_thousands_sep(L"-1 234 567,89    RUB"));
         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, iter.base());
-        assert(ex == L"   -1 234 567,89 RUB");
+        assert(ex == convert_thousands_sep(L"   -1 234 567,89 RUB"));
         assert(ios.width() == 0);
     }
 }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
   return 0;
 }

libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp

 
 // string_type curr_symbol() const;
 
 #include <locale>
 #include <limits>
 #include <cassert>
 
 #include "test_macros.h"
+#include "locale_helpers.h"
 #include "platform_support.h" // locale name macros
 
 class Fnf
     : public std::moneypunct_byname<char, false>
 {
 public:
     explicit Fnf(const std::string& nm, std::size_t refs = 0)
         : std::moneypunct_byname<char, false>(nm, refs) {}
#endif
     {
         Fwt f(LOCALE_fr_FR_UTF_8, 1);
         assert(f.curr_symbol() == L" EUR");
     }
 #endif
 
     {
         Fnf f(LOCALE_ru_RU_UTF_8, 1);
-#if defined(_CS_GNU_LIBC_VERSION)
-        // GLIBC <= 2.23 uses currency_symbol="<U0440><U0443><U0431>"
-        // GLIBC >= 2.24 uses currency_symbol="<U20BD>"
-        // See also: http://www.fileformat.info/info/unicode/char/20bd/index.htm
-        if (!glibc_version_less_than("2.24"))
-          assert(f.curr_symbol() == " \xE2\x82\xBD"); // \u20BD
-        else
-          assert(f.curr_symbol() == " \xD1\x80\xD1\x83\xD0\xB1"); // \u0440\u0443\u0431
-#elif defined(_WIN32) || defined(__FreeBSD__)
-        assert(f.curr_symbol() == " \xE2\x82\xBD"); // \u20BD
-#else
-        assert(f.curr_symbol() == " \xD1\x80\xD1\x83\xD0\xB1."); // \u0440\u0443\u0431.
-#endif
+        assert(f.curr_symbol() == " " + static_cast<std::string>(LocaleHelpers::currency_symbol_ru_RU()));
     }
     {
         Fnt f(LOCALE_ru_RU_UTF_8, 1);
         assert(f.curr_symbol() == " RUB");
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_ru_RU_UTF_8, 1);
-#if defined(_CS_GNU_LIBC_VERSION)
-        if (!glibc_version_less_than("2.24"))
-          assert(f.curr_symbol() == L" \u20BD");
-        else
-          assert(f.curr_symbol() == L" \u0440\u0443\u0431");
-#elif defined(_WIN32) || defined(__FreeBSD__)
-        assert(f.curr_symbol() == L" \u20BD");
-#else
-        assert(f.curr_symbol() == L" \u0440\u0443\u0431.");
-#endif
+        assert(f.curr_symbol() == L" " + static_cast<std::wstring>(LocaleHelpers::currency_symbol_ru_RU()));
     }
 
     {
         Fwt f(LOCALE_ru_RU_UTF_8, 1);
         assert(f.curr_symbol() == L" RUB");
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 

libcxx/test/support/locale_helpers.h

+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+#ifndef LIBCXX_TEST_SUPPORT_LOCALE_HELPERS_H
+#define LIBCXX_TEST_SUPPORT_LOCALE_HELPERS_H
+
+#include <string>
+#include "platform_support.h"
+#include "test_macros.h"
+#include "make_string.h"
+
+#ifndef TEST_HAS_NO_WIDE_CHARACTERS
+
+#include <cwctype>
+
+#endif // TEST_HAS_NO_WIDE_CHARACTERS
+
+namespace LocaleHelpers {
+
+#ifndef TEST_HAS_NO_WIDE_CHARACTERS
+
+std::wstring convert_thousands_sep(std::wstring const& in, wchar_t sep) {
+  std::wstring out;
+  bool seen_num_start = false;
+  bool seen_decimal = false;
+  for (unsigned i = 0; i < in.size(); ++i) {
+    seen_decimal |= in[i] == L',';
+    seen_num_start |= in[i] == L'-' || std::iswdigit(in[i]);
+    if (seen_decimal || !seen_num_start || in[i] != L' ') {
+      out.push_back(in[i]);
+      continue;
+    }
+    assert(in[i] == L' ');
+    out.push_back(sep);
+  }
+  return out;
+}
+
+// GLIBC 2.27 and newer use U+202F NARROW NO-BREAK SPACE as a thousands separator.
+// This function converts the spaces in string inputs to U+202F if need
+// be. FreeBSD's locale data also uses U+202F, since 2018.
+// Windows uses U+00A0 NO-BREAK SPACE.
+std::wstring convert_thousands_sep_fr_FR(std::wstring const& in) {
+#if defined(_CS_GNU_LIBC_VERSION) || defined(__FreeBSD__)
+#if defined(_CS_GNU_LIBC_VERSION)
+  if (glibc_version_less_than("2.27"))
+    return in;
+#endif
+  return convert_thousands_sep(in, L'\u202F');
+#elif defined(_WIN32)
+  return convert_thousands_sep(in, L'\u00A0');
+#else
+  return in;
+#endif
+}
+
+// GLIBC 2.27 uses U+202F NARROW NO-BREAK SPACE as a thousands separator.
+// FreeBSD and Windows use U+00A0 NO-BREAK SPACE.
+std::wstring convert_thousands_sep_ru_RU(std::wstring const& in) {
+#if defined(TEST_HAS_GLIBC)
+  return convert_thousands_sep(in, L'\u202F');
+#elif defined(__FreeBSD__) || defined(_WIN32)
+  return convert_thousands_sep(in, L'\u00A0');
+#else
+  return in;
+#endif
+}
+
+#endif // TEST_HAS_NO_WIDE_CHARACTERS
+
+MultiStringType currency_symbol_ru_RU() {
+#if defined(_CS_GNU_LIBC_VERSION)
+  if (glibc_version_less_than("2.24"))
+    return MKSTR("\u0440\u0443\u0431");
+  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
+}
+
+} // namespace LocaleHelpers
+
+#endif // LIBCXX_TEST_SUPPORT_LOCALE_HELPERS_H