From 2ba7c75ed134b73c857ca5575d8803313a50db60 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 2 Mar 2023 09:17:33 +0100 Subject: [PATCH] nl_langinfo tests: Avoid test failure on Solaris 11. * tests/test-nl_langinfo2.c (main): Skip French T_FMT_AMPM test on Solaris. --- ChangeLog | 6 ++++++ tests/test-nl_langinfo2.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa99891e55..5076ac68ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-03-02 Bruno Haible + + nl_langinfo tests: Avoid test failure on Solaris 11. + * tests/test-nl_langinfo2.c (main): Skip French T_FMT_AMPM test on + Solaris. + 2023-02-28 Benno Schulenberg (tiny change) terminfo, termcap: Fix more spellos in a comment. diff --git a/tests/test-nl_langinfo2.c b/tests/test-nl_langinfo2.c index 4625a8a0f8..7f276da83d 100644 --- a/tests/test-nl_langinfo2.c +++ b/tests/test-nl_langinfo2.c @@ -91,9 +91,9 @@ main (int argc, char *argv[]) ASSERT (strcmp (fr_RADIXCHAR, ",") == 0); /* nl_langinfo items of the LC_TIME category */ - /* macOS doesn't get the LC_TIME values right. + /* macOS and Solaris 11 don't get the LC_TIME values right. Poor. */ - #if !(defined __APPLE__ && defined __MACH__) + #if !((defined __APPLE__ && defined __MACH__) || defined __sun) const char *fr_T_FMT_AMPM = nl_langinfo (T_FMT_AMPM); const char *fr_AM_STR = nl_langinfo (AM_STR); const char *fr_PM_STR = nl_langinfo (PM_STR); -- 2.39.5