Skip to content

Commit ccb60ee

Browse files
bhaiblebhaible
committed
is*_l, fnmatch tests: Avoid test failures on macOS 15.4.
Reported by Daniel Collins <solemnwarning@solemnwarning.net> at <https://savannah.gnu.org/bugs/?67007>. * 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.
1 parent 0710282 commit ccb60ee

5 files changed

Lines changed: 28 additions & 17 deletions

File tree

‎ChangeLog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2025-04-12 Bruno Haible <bruno@clisp.org>
2+
3+
is*_l, fnmatch tests: Avoid test failures on macOS 15.4.
4+
Reported by Daniel Collins <solemnwarning@solemnwarning.net>
5+
at <https://savannah.gnu.org/bugs/?67007>.
6+
* tests/test-isgraph_l.c (main): On macOS, disable test cases that fail
7+
on macOS 15.4.
8+
* tests/test-isprint_l.c (main): Likewise.
9+
* tests/test-ispunct_l.c (main): Likewise.
10+
* tests/test-fnmatch.c (main): Likewise.
11+
112
2025-04-12 Bruno Haible <bruno@clisp.org>
213

314
vasnprintf: Work around two grouping bugs on native Windows.

‎tests/test-fnmatch.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -626,17 +626,17 @@ main (int argc, char *argv[])
626626
ASSERT (fnmatch ("x[[:alnum:]]y", "x\330y", 0) == 0);
627627
/* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
628628
ASSERT (fnmatch ("x[[:alpha:]]y", "x\330y", 0) == 0);
629-
#if !(defined __FreeBSD__ || defined __DragonFly__)
629+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
630630
/* U+00B8 CEDILLA */
631631
ASSERT (fnmatch ("x[[:graph:]]y", "x\270y", 0) == 0);
632632
#endif
633633
/* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
634634
ASSERT (fnmatch ("x[[:lower:]]y", "x\377y", 0) == 0);
635-
#if !(defined __FreeBSD__ || defined __DragonFly__)
635+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
636636
/* U+00B8 CEDILLA */
637637
ASSERT (fnmatch ("x[[:print:]]y", "x\270y", 0) == 0);
638638
#endif
639-
#if !(defined __FreeBSD__ || defined __DragonFly__)
639+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
640640
/* U+00BF INVERTED QUESTION MARK */
641641
ASSERT (fnmatch ("x[[:punct:]]y", "x\277y", 0) == 0);
642642
#endif
@@ -794,7 +794,7 @@ main (int argc, char *argv[])
794794
/* U+00B8 CEDILLA */
795795
ASSERT (fnmatch ("x[[:print:]]y", "x\217\242\261y", 0) == 0);
796796
#endif
797-
#if !(defined __FreeBSD__ || defined __DragonFly__)
797+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
798798
/* U+00D7 MULTIPLICATION SIGN */
799799
ASSERT (fnmatch ("x[[:punct:]]y", "x\241\337y", 0) == 0);
800800
#endif
@@ -863,51 +863,51 @@ main (int argc, char *argv[])
863863
ASSERT (fnmatch ("x?y", "x\250\271y", 0) == 0); /* "xüy" */
864864
ASSERT (fnmatch ("x?y", "x\201\060\211\070y", 0) == 0); /* "xßy" */
865865
ASSERT (fnmatch ("x?y", "x\224\071\375\067y", 0) == 0); /* "x😋y" */
866-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
866+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
867867
/* U+0141 LATIN CAPITAL LETTER L WITH STROKE */
868868
ASSERT (fnmatch ("x[[:alnum:]]y", "x\201\060\221\071y", 0) == 0);
869869
#endif
870-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
870+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
871871
/* U+0141 LATIN CAPITAL LETTER L WITH STROKE */
872872
ASSERT (fnmatch ("x[[:alpha:]]y", "x\201\060\221\071y", 0) == 0);
873873
#endif
874-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
874+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
875875
/* U+00B8 CEDILLA */
876876
ASSERT (fnmatch ("x[[:graph:]]y", "x\201\060\206\060y", 0) == 0);
877877
#endif
878878
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun)
879879
/* U+20000 <CJK Ideograph> */
880880
ASSERT (fnmatch ("x[[:graph:]]y", "x\225\062\202\066y", 0) == 0);
881881
#endif
882-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
882+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
883883
/* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
884884
ASSERT (fnmatch ("x[[:lower:]]y", "x\201\060\213\067y", 0) == 0);
885885
#endif
886886
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun)
887887
/* U+10441 DESERET SMALL LETTER EF */
888888
ASSERT (fnmatch ("x[[:lower:]]y", "x\220\060\355\071y", 0) == 0);
889889
#endif
890-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
890+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
891891
/* U+00B8 CEDILLA */
892892
ASSERT (fnmatch ("x[[:print:]]y", "x\201\060\206\060y", 0) == 0);
893893
#endif
894894
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun)
895895
/* U+20000 <CJK Ideograph> */
896896
ASSERT (fnmatch ("x[[:print:]]y", "x\225\062\202\066y", 0) == 0);
897897
#endif
898-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __illumos__)
898+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __illumos__)
899899
/* U+00D7 MULTIPLICATION SIGN */
900900
ASSERT (fnmatch ("x[[:punct:]]y", "x\241\301y", 0) == 0);
901901
#endif
902902
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun)
903903
/* U+1D100 MUSICAL SYMBOL SINGLE BARLINE */
904904
ASSERT (fnmatch ("x[[:punct:]]y", "x\224\062\273\064y", 0) == 0);
905905
#endif
906-
#if !(defined __FreeBSD__ || defined __DragonFly__)
906+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
907907
/* U+3000 IDEOGRAPHIC SPACE */
908908
ASSERT (fnmatch ("x[[:space:]]y", "x\241\241y", 0) == 0);
909909
#endif
910-
#if !(defined __FreeBSD__ || defined __DragonFly__)
910+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
911911
/* U+0429 CYRILLIC CAPITAL LETTER SHCHA */
912912
ASSERT (fnmatch ("x[[:upper:]]y", "x\247\273y", 0) == 0);
913913
#endif

‎tests/test-isgraph_l.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ main ()
117117
is = isgraph_l ((unsigned char) '\240', locale);
118118
ASSERT (is != 0);
119119
#endif
120-
#if !(defined __FreeBSD__ || defined __DragonFly__)
120+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
121121
/* U+00B8 CEDILLA */
122122
is = isgraph_l ((unsigned char) '\270', locale);
123123
ASSERT (is != 0);

‎tests/test-isprint_l.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ main ()
111111
/* U+007F <control> */
112112
is = isprint_l ((unsigned char) '\177', locale);
113113
ASSERT (is == 0);
114-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sgi || (defined _WIN32 && !defined __CYGWIN__))
114+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sgi || (defined _WIN32 && !defined __CYGWIN__))
115115
/* U+00A0 NO-BREAK SPACE */
116116
is = isprint_l ((unsigned char) '\240', locale);
117117
ASSERT (is != 0);
118118
#endif
119-
#if !(defined __FreeBSD__ || defined __DragonFly__)
119+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
120120
/* U+00B8 CEDILLA */
121121
is = isprint_l ((unsigned char) '\270', locale);
122122
ASSERT (is != 0);

‎tests/test-ispunct_l.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ main ()
134134
/* Locale encoding is ISO-8859-1 or ISO-8859-15. */
135135
int is;
136136

137-
#if !(defined __FreeBSD__ || defined __DragonFly__)
137+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__)
138138
/* U+00BF INVERTED QUESTION MARK */
139139
is = ispunct_l ((unsigned char) '\277', locale);
140140
ASSERT (is != 0);
141141
#endif
142-
#if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
142+
#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
143143
/* U+00D7 MULTIPLICATION SIGN */
144144
is = ispunct_l ((unsigned char) '\327', locale);
145145
ASSERT (is != 0);

0 commit comments

Comments
 (0)