From ccb60ee9ab0205cfd23066bd520d1a0c9c7a0a76 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 12 Apr 2025 12:45:40 +0200 Subject: [PATCH] is*_l, fnmatch tests: Avoid test failures on macOS 15.4. Reported by Daniel Collins at . * tests/test-isgraph_l.c (main): On macOS, disable test cases that fail on macOS 15.4. * tests/test-isprint_l.c (main): Likewise. * tests/test-ispunct_l.c (main): Likewise. * tests/test-fnmatch.c (main): Likewise. --- ChangeLog | 11 +++++++++++ tests/test-fnmatch.c | 24 ++++++++++++------------ tests/test-isgraph_l.c | 2 +- tests/test-isprint_l.c | 4 ++-- tests/test-ispunct_l.c | 4 ++-- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5deaa6a969..0fac61a31e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2025-04-12 Bruno Haible + + is*_l, fnmatch tests: Avoid test failures on macOS 15.4. + Reported by Daniel Collins + at . + * tests/test-isgraph_l.c (main): On macOS, disable test cases that fail + on macOS 15.4. + * tests/test-isprint_l.c (main): Likewise. + * tests/test-ispunct_l.c (main): Likewise. + * tests/test-fnmatch.c (main): Likewise. + 2025-04-12 Bruno Haible vasnprintf: Work around two grouping bugs on native Windows. diff --git a/tests/test-fnmatch.c b/tests/test-fnmatch.c index 5cb217a34e..c8447cd239 100644 --- a/tests/test-fnmatch.c +++ b/tests/test-fnmatch.c @@ -626,17 +626,17 @@ main (int argc, char *argv[]) ASSERT (fnmatch ("x[[:alnum:]]y", "x\330y", 0) == 0); /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */ ASSERT (fnmatch ("x[[:alpha:]]y", "x\330y", 0) == 0); - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+00B8 CEDILLA */ ASSERT (fnmatch ("x[[:graph:]]y", "x\270y", 0) == 0); #endif /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */ ASSERT (fnmatch ("x[[:lower:]]y", "x\377y", 0) == 0); - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+00B8 CEDILLA */ ASSERT (fnmatch ("x[[:print:]]y", "x\270y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+00BF INVERTED QUESTION MARK */ ASSERT (fnmatch ("x[[:punct:]]y", "x\277y", 0) == 0); #endif @@ -794,7 +794,7 @@ main (int argc, char *argv[]) /* U+00B8 CEDILLA */ ASSERT (fnmatch ("x[[:print:]]y", "x\217\242\261y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+00D7 MULTIPLICATION SIGN */ ASSERT (fnmatch ("x[[:punct:]]y", "x\241\337y", 0) == 0); #endif @@ -863,15 +863,15 @@ main (int argc, char *argv[]) ASSERT (fnmatch ("x?y", "x\250\271y", 0) == 0); /* "xüy" */ ASSERT (fnmatch ("x?y", "x\201\060\211\070y", 0) == 0); /* "xßy" */ ASSERT (fnmatch ("x?y", "x\224\071\375\067y", 0) == 0); /* "x😋y" */ - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */ ASSERT (fnmatch ("x[[:alnum:]]y", "x\201\060\221\071y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */ ASSERT (fnmatch ("x[[:alpha:]]y", "x\201\060\221\071y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+00B8 CEDILLA */ ASSERT (fnmatch ("x[[:graph:]]y", "x\201\060\206\060y", 0) == 0); #endif @@ -879,7 +879,7 @@ main (int argc, char *argv[]) /* U+20000 */ ASSERT (fnmatch ("x[[:graph:]]y", "x\225\062\202\066y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */ ASSERT (fnmatch ("x[[:lower:]]y", "x\201\060\213\067y", 0) == 0); #endif @@ -887,7 +887,7 @@ main (int argc, char *argv[]) /* U+10441 DESERET SMALL LETTER EF */ ASSERT (fnmatch ("x[[:lower:]]y", "x\220\060\355\071y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+00B8 CEDILLA */ ASSERT (fnmatch ("x[[:print:]]y", "x\201\060\206\060y", 0) == 0); #endif @@ -895,7 +895,7 @@ main (int argc, char *argv[]) /* U+20000 */ ASSERT (fnmatch ("x[[:print:]]y", "x\225\062\202\066y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __illumos__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __illumos__) /* U+00D7 MULTIPLICATION SIGN */ ASSERT (fnmatch ("x[[:punct:]]y", "x\241\301y", 0) == 0); #endif @@ -903,11 +903,11 @@ main (int argc, char *argv[]) /* U+1D100 MUSICAL SYMBOL SINGLE BARLINE */ ASSERT (fnmatch ("x[[:punct:]]y", "x\224\062\273\064y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+3000 IDEOGRAPHIC SPACE */ ASSERT (fnmatch ("x[[:space:]]y", "x\241\241y", 0) == 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+0429 CYRILLIC CAPITAL LETTER SHCHA */ ASSERT (fnmatch ("x[[:upper:]]y", "x\247\273y", 0) == 0); #endif diff --git a/tests/test-isgraph_l.c b/tests/test-isgraph_l.c index e118d86130..2ad0033ce2 100644 --- a/tests/test-isgraph_l.c +++ b/tests/test-isgraph_l.c @@ -117,7 +117,7 @@ main () is = isgraph_l ((unsigned char) '\240', locale); ASSERT (is != 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+00B8 CEDILLA */ is = isgraph_l ((unsigned char) '\270', locale); ASSERT (is != 0); diff --git a/tests/test-isprint_l.c b/tests/test-isprint_l.c index 8ac6bed64a..222e5567bd 100644 --- a/tests/test-isprint_l.c +++ b/tests/test-isprint_l.c @@ -111,12 +111,12 @@ main () /* U+007F */ is = isprint_l ((unsigned char) '\177', locale); ASSERT (is == 0); - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sgi || (defined _WIN32 && !defined __CYGWIN__)) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sgi || (defined _WIN32 && !defined __CYGWIN__)) /* U+00A0 NO-BREAK SPACE */ is = isprint_l ((unsigned char) '\240', locale); ASSERT (is != 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+00B8 CEDILLA */ is = isprint_l ((unsigned char) '\270', locale); ASSERT (is != 0); diff --git a/tests/test-ispunct_l.c b/tests/test-ispunct_l.c index a2e873dc33..3e6c6279d3 100644 --- a/tests/test-ispunct_l.c +++ b/tests/test-ispunct_l.c @@ -134,12 +134,12 @@ main () /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ int is; - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__) /* U+00BF INVERTED QUESTION MARK */ is = ispunct_l ((unsigned char) '\277', locale); ASSERT (is != 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+00D7 MULTIPLICATION SIGN */ is = ispunct_l ((unsigned char) '\327', locale); ASSERT (is != 0); -- 2.39.5