From 4504bf67ce156aa9b21b9bbba00b2f36c77c13c8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 24 May 2024 11:52:46 +0200 Subject: [PATCH] mbrtoc32 tests: Avoid failure on Solaris 11.4 (regression yesterday). * tests/test-mbrtoc32.c (main): Conditionalize an assertion with GL_CHAR32_T_IS_UNICODE. --- ChangeLog | 6 ++++++ tests/test-mbrtoc32.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc128db28b..f75872cdbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-05-24 Bruno Haible + + mbrtoc32 tests: Avoid failure on Solaris 11.4 (regression yesterday). + * tests/test-mbrtoc32.c (main): Conditionalize an assertion with + GL_CHAR32_T_IS_UNICODE. + 2024-05-23 Collin Funk putenv tests: Silence -Wanalyzer-putenv-of-auto-var. diff --git a/tests/test-mbrtoc32.c b/tests/test-mbrtoc32.c index 68c601e2e5..b1c50c963c 100644 --- a/tests/test-mbrtoc32.c +++ b/tests/test-mbrtoc32.c @@ -315,7 +315,7 @@ main (int argc, char *argv[]) wc = (char32_t) 0xBADFACE; ret = mbrtoc32 (&wc, "\203", 1, &state); ASSERT (ret == 1); - ASSERT (wc == 0x0001F403); + ASSERT (wc == 0x1F403); /* expect Unicode encoding */ ASSERT (mbsinit (&state)); } return test_exit_status; @@ -485,7 +485,9 @@ main (int argc, char *argv[]) wc = (char32_t) 0xBADFACE; ret = mbrtoc32 (&wc, "\067", 1, &state); ASSERT (ret == 1); - ASSERT (wc == 0x0001F403); + #if GL_CHAR32_T_IS_UNICODE + ASSERT (wc == 0x1F403); /* expect Unicode encoding */ + #endif ASSERT (mbsinit (&state)); } return test_exit_status; -- 2.39.5