From: Bruno Haible Date: Tue, 15 Apr 2025 15:12:15 +0000 (+0200) Subject: trim tests: Avoid test failures on macOS 15.4. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1d3bd3269c39f17691bbdcb7bb49e5e059030231;p=gnulib.git trim tests: Avoid test failures on macOS 15.4. * tests/test-trim.c (main): On macOS, disable test cases that fail on macOS 15.4. --- diff --git a/ChangeLog b/ChangeLog index 910d06634f..e07f4b01ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ 2025-04-15 Bruno Haible trim tests: Avoid test failures on macOS 15.4. - * tests/test-trim.c (main): On macOS, disable test cases that randomly - succeed or fail on macOS 15.4. + * tests/test-trim.c (main): On macOS, disable test cases that fail on + macOS 15.4. 2025-04-15 Bruno Haible diff --git a/tests/test-trim.c b/tests/test-trim.c index bca0afe3df..587883897d 100644 --- a/tests/test-trim.c +++ b/tests/test-trim.c @@ -137,18 +137,14 @@ main (int argc, char *argv[]) case '3': /* Locale encoding is GB18030. */ - #if (defined __APPLE__ && defined __MACH__) /* As of macOS 15.4 */ - fputs ("Skipping test: The character properties in the GB18030 locale on this system are broken.\n", stderr); - return 77; - #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun) { /* U+2002 EN SPACE */ char *result = trim ("\201\066\243\070\241\244foo\201\066\243\070"); ASSERT (strcmp (result, "\241\244foo") == 0); free (result); } #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __illumos__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __illumos__) { /* U+3000 IDEOGRAPHIC SPACE */ char *result = trim ("\241\241\241\244foo\241\241"); ASSERT (strcmp (result, "\241\244foo") == 0);