This is an archive of the discontinued LLVM Phabricator instance.

Differential D118238

[libcxx] [test] Simplify the handling of platform specific NAN formatting in put_long_double
ClosedPublic

Authored by mstorsjo on Jan 26 2022, 4:17 AM.

Details

Reviewers
ldionne
Mordante
• Quuxplusone
Group Reviewers
Restricted Project
Commits
rGe5f362828a62: [libcxx] [test] Simplify the handling of platform specific NAN formatting in…
Summary

Also opt in to testing the hexadecimal float formatting for glibc; glibc does matches the current test references there.

Diff Detail

Event Timeline

mstorsjo requested review of this revision.Jan 26 2022, 4:17 AM
mstorsjo created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 26 2022, 4:17 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B145715: Diff 403211.Jan 26 2022, 7:10 AM
mstorsjo mentioned this in D119260: [libc++] Enables put_long_double test for glibc..Feb 10 2022, 1:03 AM
mstorsjo updated this revision to Diff 407415.Feb 10 2022, 1:13 AM

Rebased on top of current git main, simplifying the already committed fix doing similar things.

mstorsjo retitled this revision from [libcxx] [test] Fix put_long_double on glibc to [libcxx] [test] Simplify the handling of platform specific NAN formatting in put_long_double.Feb 10 2022, 1:14 AM
mstorsjo edited the summary of this revision. (Show Details)
mstorsjo added a reviewer: Mordante.
Harbormaster completed remote builds in B148671: Diff 407415.Feb 10 2022, 2:12 AM
Mordante added inline comments.Feb 10 2022, 10:00 AM
libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
10907

How do you feel about always using strings like pnan_padding25 + pnan_sign + "nan" and not have pnan and PNAN?

24413

Is this change still needed? The test currently passes CI without this change.

mstorsjo added inline comments.Feb 10 2022, 10:40 AM
libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
10907

That’d work for me too.

24413

It’s not needed, but this is a test that currently only is executed on apple platforms (because it hadn’t passed on FreeBSD). This test does pass on glibc too, so let’s run it there too, for increased test coverage.

mstorsjo updated this revision to Diff 407794.Feb 11 2022, 12:28 AM

Removed the pnan/PNAN strings and kept literal "nan" and "NAN".

If preferred, I could split out the change to opt in to the hexadecimal formatting tests into a separate change.

Harbormaster completed remote builds in B148928: Diff 407794.Feb 11 2022, 2:59 AM
Mordante accepted this revision as: Mordante.Feb 11 2022, 8:58 AM

LGTM!

mstorsjo added a reviewer: • Quuxplusone.Feb 11 2022, 10:15 AM
• Quuxplusone accepted this revision.Feb 14 2022, 8:35 AM

I suggest an alternative approach, but I see no reason to block over that, so might as well accept. Feel free to adopt the IF_GLIBC idea or not, I guess.

libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
10891

This is obscure enough I shouldn't really care, but wouldn't it be easier to understand the test if it was like

assert(ex == IF_GLIBC("+nan", "nan"));
~~~
assert(ex == IF_GLIBC("+nan*********************",
                      "nan**********************"));

and so on? (The IF_GLIBC macro would just be scoped to this one file.)

This revision is now accepted and ready to land.Feb 14 2022, 8:35 AM
mstorsjo added inline comments.Feb 14 2022, 8:47 AM
libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
10891

I think I’d prefer to not go with this approach. I’ll add windows into the mix soon (which does the same as glibc here) so the macro naming would be less straightforward then. And going further, there could (theoretically, at least in some other test) be more than two different variations, which is easier if the conditionals are centralized.

Mordante added a comment.Feb 14 2022, 8:53 AM
In D118238#3319384, @Quuxplusone wrote:

I suggest an alternative approach, but I see no reason to block over that, so might as well accept. Feel free to adopt the IF_GLIBC idea or not, I guess.

I don't mind that approach, but then I prefer a global macro. There are more localization tests disabled due to glibc giving a different result.

mstorsjo added a comment.Feb 14 2022, 12:20 PM
In D118238#3319443, @Mordante wrote:
In D118238#3319384, @Quuxplusone wrote:

I suggest an alternative approach, but I see no reason to block over that, so might as well accept. Feel free to adopt the IF_GLIBC idea or not, I guess.

I don't mind that approach, but then I prefer a global macro. There are more localization tests disabled due to glibc giving a different result.

I think I'll go with my original approach for now. Especially in this test, I think that results in less clunky code. And for other tests, given that there's more than two platforms that may want to expect different results, the exact form of handling it can differ a bit between all tests. (FWIW I have a couple more glibc locale fixes in my queue in various state of finished, and a bunch of more windows locale fixes on top of those too.)

This revision was landed with ongoing or failed builds.Feb 14 2022, 12:21 PM
Closed by commit rGe5f362828a62: [libcxx] [test] Simplify the handling of platform specific NAN formatting in… (authored by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGe5f362828a62: [libcxx] [test] Simplify the handling of platform specific NAN formatting in….

Revision Contents

PathSize
libcxx/
test/
std/
localization/
locale.categories/
category.numeric/
locale.nm.put/
facet.num.put.members/
201 lines

Diff 408557

libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 10,711 Lines • ▼ Show 20 Lines
} }
void test5() void test5()
{ {
char str[200]; char str[200];
std::locale lc = std::locale::classic(); std::locale lc = std::locale::classic();
std::locale lg(lc, new my_numpunct); std::locale lg(lc, new my_numpunct);
const my_facet f(1); const my_facet f(1);
#if defined(TEST_HAS_GLIBC)
std::string pnan_sign = "+";
std::string pnan_padding25 = "*********************";
#else
std::string pnan_sign = "";
std::string pnan_padding25 = "**********************";
#endif
{ {
long double v = std::nan(""); long double v = std::nan("");
std::ios ios(0); std::ios ios(0);
// %g // %g
{ {
ios.precision(0); ios.precision(0);
{ {
nouppercase(ios); nouppercase(ios);
▲ Show 20 Lines • Show All 148 Lines • ▼ Show 20 Lines#endif
noshowpoint(ios); noshowpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan");
QuuxplusoneUnsubmitted
Not Done
ReplyInline Actions

This is obscure enough I shouldn't really care, but wouldn't it be easier to understand the test if it was like

assert(ex == IF_GLIBC("+nan", "nan"));
~~~
assert(ex == IF_GLIBC("+nan*********************",
                      "nan**********************"));

and so on? (The IF_GLIBC macro would just be scoped to this one file.)

Quuxplusone: This is obscure enough I shouldn't really care, but wouldn't it be easier to understand the…
mstorsjoAuthorUnsubmitted
Done
ReplyInline Actions

I think I’d prefer to not go with this approach. I’ll add windows into the mix soon (which does the same as glibc here) so the macro naming would be less straightforward then. And going further, there could (theoretically, at least in some other test) be more than two different variations, which is easier if the conditionals are centralized.

mstorsjo: I think I’d prefer to not go with this approach. I’ll add windows into the mix soon (which does…
assert(ex == "+nan");
#else
assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan" + pnan_padding25);
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "nan");
MordanteUnsubmitted
Not Done
ReplyInline Actions

How do you feel about always using strings like pnan_padding25 + pnan_sign + "nan" and not have pnan and PNAN?

Mordante: How do you feel about always using strings like `pnan_padding25 + pnan_sign + "nan"` and not…
mstorsjoAuthorUnsubmitted
Done
ReplyInline Actions

That’d work for me too.

mstorsjo: That’d work for me too.
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "nan");
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan");
assert(ex == "+nan");
#else
assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan" + pnan_padding25);
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "nan");
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "nan");
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
showpoint(ios); showpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan");
assert(ex == "+nan");
#else
assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan" + pnan_padding25);
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "nan");
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "nan");
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan");
assert(ex == "+nan");
#else
assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "nan" + pnan_padding25);
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "nan");
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "nan");
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
} }
} }
uppercase(ios); uppercase(ios);
{ {
▲ Show 20 Lines • Show All 147 Lines • ▼ Show 20 Lines#endif
noshowpoint(ios); noshowpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN");
assert(ex == "+NAN");
#else
assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN" + pnan_padding25);
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "NAN");
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "NAN");
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN");
assert(ex == "+NAN");
#else
assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN" + pnan_padding25);
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "NAN");
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "NAN");
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
showpoint(ios); showpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN");
assert(ex == "+NAN");
#else
assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN" + pnan_padding25);
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "NAN");
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "NAN");
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN");
assert(ex == "+NAN");
#else
assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + "NAN" + pnan_padding25);
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_padding25 + pnan_sign + "NAN");
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC) assert(ex == pnan_sign + pnan_padding25 + "NAN");
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
} }
} }
} }
ios.precision(1); ios.precision(1);
▲ Show 20 Lines • Show All 13,083 Lines • ▼ Show 20 Lines
} }
} }
} }
void test12() void test12()
{ {
std::locale lc = std::locale::classic(); std::locale lc = std::locale::classic();
std::locale lg(lc, new my_numpunct); std::locale lg(lc, new my_numpunct);
#if defined(__APPLE__) && defined(__x86_64__) #if (defined(__APPLE__) || defined(TEST_HAS_GLIBC)) && defined(__x86_64__)
MordanteUnsubmitted
Not Done
ReplyInline Actions

Is this change still needed? The test currently passes CI without this change.

Mordante: Is this change still needed? The test currently passes CI without this change.
mstorsjoAuthorUnsubmitted
Done
ReplyInline Actions

It’s not needed, but this is a test that currently only is executed on apple platforms (because it hadn’t passed on FreeBSD). This test does pass on glibc too, so let’s run it there too, for increased test coverage.

mstorsjo: It’s not needed, but this is a test that currently only is executed on apple platforms (because…
// This test is failing on FreeBSD, possibly due to different representations // This test is failing on FreeBSD, possibly due to different representations
// of the floating point numbers. // of the floating point numbers.
const my_facet f(1); const my_facet f(1);
char str[200]; char str[200];
{ {
long double v = 1234567890.125; long double v = 1234567890.125;
std::ios ios(0); std::ios ios(0);
hexfloat(ios); hexfloat(ios);
▲ Show 20 Lines • Show All 1,822 Lines • Show Last 20 Lines