This patch avoids a few test failures on Haiku:
FAIL: test-c32iscntrl.sh
========================
../../gltests/test-c32iscntrl.c:147: assertion 'is != 0' failed
Abort
../../gltests/test-c32iscntrl.sh: line 36: 63996 Kill Thread
LC_ALL="$testlocale" ${CHECKER} ./test-c32iscntrl${EXEEXT} 3
FAIL test-c32iscntrl.sh (exit status: 1)
FAIL: test-c32isgraph.sh
========================
../../gltests/test-c32isgraph.c:157: assertion 'is != 0' failed
Abort
../../gltests/test-c32isgraph.sh: line 36: 64016 Kill Thread
LC_ALL="$testlocale" ${CHECKER} ./test-c32isgraph${EXEEXT} 3
FAIL test-c32isgraph.sh (exit status: 1)
FAIL: test-c32islower.sh
========================
../../gltests/test-c32islower.c:204: assertion 'is == 0' failed
Abort
../../gltests/test-c32islower.sh: line 36: 64028 Kill Thread
LC_ALL="$testlocale" ${CHECKER} ./test-c32islower${EXEEXT} 3
FAIL test-c32islower.sh (exit status: 1)
FAIL: test-c32isprint.sh
========================
../../gltests/test-c32isprint.c:169: assertion 'is == 0' failed
Abort
../../gltests/test-c32isprint.sh: line 36: 64040 Kill Thread
LC_ALL="$testlocale" ${CHECKER} ./test-c32isprint${EXEEXT} 3
FAIL test-c32isprint.sh (exit status: 1)
FAIL: test-c32ispunct.sh
========================
../../gltests/test-c32ispunct.c:121: assertion 'is != 0' failed
Abort
../../gltests/test-c32ispunct.sh: line 36: 64052 Kill Thread
LC_ALL="$testlocale" ${CHECKER} ./test-c32ispunct${EXEEXT} 3
FAIL test-c32ispunct.sh (exit status: 1)
FAIL: test-c32toupper.sh
========================
+ LC_ALL=C
+ ./test-c32toupper 0
+ LC_ALL=POSIX
+ ./test-c32toupper 0
+ : none
+ test none '!=' none
+ : none
+ test none '!=' none
+ : en_US.UTF-8
+ : none
+ test en_US.UTF-8 '!=' none
+ test none '!=' none
+ testlocale=en_US.UTF-8
+ LC_ALL=en_US.UTF-8
+ ./test-c32toupper 3
../../gltests/test-c32toupper.c:262: assertion 'memcmp (mb.buf, "\302\265", 2)
== 0' failed
Abort
../../gltests/test-c32toupper.sh: line 39: 64214 Kill Thread
LC_ALL="$testlocale" ${CHECKER} ./test-c32toupper${EXEEXT} 3
+ exit 1
FAIL test-c32toupper.sh (exit status: 1)
FAIL: test-isgraph_l
====================
../../gltests/test-isgraph_l.c:114: assertion 'is != 0' failed
Abort
FAIL test-isgraph_l (exit status: 149)
FAIL: test-islower_l
====================
../../gltests/test-islower_l.c:123: assertion 'is == 0' failed
Abort
FAIL test-islower_l (exit status: 149)
FAIL: test-ispunct_l
====================
../../gltests/test-ispunct_l.c:96: assertion 'is != 0' failed
Abort
FAIL test-ispunct_l (exit status: 149)
>From 0663e3841af110d7509872955dc13515645d547f Mon Sep 17 00:00:00 2001
From: Bruno Haible <[email protected]>
Date: Sat, 17 Jan 2026 13:31:50 +0100
Subject: [PATCH] c32is* tests: Avoid test failures on Haiku.
* tests/test-c32iscntrl.c (main): Disable tests that fail on Haiku.
* tests/test-c32isgraph.c (main): Likewise.
* tests/test-c32islower.c (main): Likewise.
* tests/test-c32isprint.c (main): Likewise.
* tests/test-c32ispunct.c (main): Likewise.
* tests/test-c32toupper.c (main): Likewise.
* tests/test-isgraph_l.c (main): Likewise.
* tests/test-islower_l.c (main): Likewise.
* tests/test-ispunct_l.c (main): Likewise.
---
ChangeLog | 13 +++++++++++++
tests/test-c32iscntrl.c | 6 +++---
tests/test-c32isgraph.c | 8 ++++----
tests/test-c32islower.c | 2 +-
tests/test-c32isprint.c | 6 +++---
tests/test-c32ispunct.c | 12 ++++++++----
tests/test-c32toupper.c | 2 +-
tests/test-isgraph_l.c | 2 +-
tests/test-islower_l.c | 2 +-
tests/test-ispunct_l.c | 8 ++++++--
10 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 75db85a35d..d9357abb01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2026-01-17 Bruno Haible <[email protected]>
+
+ c32is* tests: Avoid test failures on Haiku.
+ * tests/test-c32iscntrl.c (main): Disable tests that fail on Haiku.
+ * tests/test-c32isgraph.c (main): Likewise.
+ * tests/test-c32islower.c (main): Likewise.
+ * tests/test-c32isprint.c (main): Likewise.
+ * tests/test-c32ispunct.c (main): Likewise.
+ * tests/test-c32toupper.c (main): Likewise.
+ * tests/test-isgraph_l.c (main): Likewise.
+ * tests/test-islower_l.c (main): Likewise.
+ * tests/test-ispunct_l.c (main): Likewise.
+
2026-01-17 Bruno Haible <[email protected]>
unlinkat tests: Avoid a test failure on Haiku.
diff --git a/tests/test-c32iscntrl.c b/tests/test-c32iscntrl.c
index d567e4aa65..8bf7d35cdc 100644
--- a/tests/test-c32iscntrl.c
+++ b/tests/test-c32iscntrl.c
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
/* U+00A0 NO-BREAK SPACE */
is = for_character ("\302\240", 2);
ASSERT (is == 0);
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__ || defined __HAIKU__)
/* U+202E RIGHT-TO-LEFT OVERRIDE */
is = for_character ("\342\200\256", 3);
ASSERT (is != 0);
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
/* U+3000 IDEOGRAPHIC SPACE */
is = for_character ("\343\200\200", 3);
ASSERT (is == 0);
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__ || defined __HAIKU__)
/* U+FEFF ZERO WIDTH NO-BREAK SPACE */
is = for_character ("\357\273\277", 3);
ASSERT (is != 0);
@@ -157,7 +157,7 @@ main (int argc, char *argv[])
/* U+20000 <CJK Ideograph> */
is = for_character ("\360\240\200\200", 4);
ASSERT (is == 0);
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__ || defined __HAIKU__)
/* U+E0001 LANGUAGE TAG */
is = for_character ("\363\240\200\201", 4);
ASSERT (is != 0);
diff --git a/tests/test-c32isgraph.c b/tests/test-c32isgraph.c
index f1f1b988fd..471710f37a 100644
--- a/tests/test-c32isgraph.c
+++ b/tests/test-c32isgraph.c
@@ -151,7 +151,7 @@ main (int argc, char *argv[])
/* U+007F <control> */
is = for_character ("\177", 1);
ASSERT (is == 0);
- #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__))
+ #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __HAIKU__)
/* U+00A0 NO-BREAK SPACE */
is = for_character ("\302\240", 2);
ASSERT (is != 0);
@@ -162,7 +162,7 @@ main (int argc, char *argv[])
/* U+2002 EN SPACE */
is = for_character ("\342\200\202", 3);
ASSERT (is == 0);
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__ || defined __HAIKU__)
/* U+202E RIGHT-TO-LEFT OVERRIDE */
is = for_character ("\342\200\256", 3);
ASSERT (is == 0);
@@ -170,7 +170,7 @@ main (int argc, char *argv[])
/* U+3000 IDEOGRAPHIC SPACE */
is = for_character ("\343\200\200", 3);
ASSERT (is == 0);
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__ || defined __HAIKU__)
/* U+FEFF ZERO WIDTH NO-BREAK SPACE */
is = for_character ("\357\273\277", 3);
ASSERT (is == 0);
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
is = for_character ("\360\240\200\200", 4);
ASSERT (is != 0);
#endif
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__ || defined __HAIKU__)
/* U+E0001 LANGUAGE TAG */
is = for_character ("\363\240\200\201", 4);
ASSERT (is == 0);
diff --git a/tests/test-c32islower.c b/tests/test-c32islower.c
index d6a53b5479..ea176b1428 100644
--- a/tests/test-c32islower.c
+++ b/tests/test-c32islower.c
@@ -198,7 +198,7 @@ main (int argc, char *argv[])
/* U+00B2 SUPERSCRIPT TWO */
is = for_character ("\302\262", 2);
ASSERT (is == 0);
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__ || defined __HAIKU__)
/* U+00B5 MICRO SIGN */
is = for_character ("\302\265", 2);
ASSERT (is == 0);
diff --git a/tests/test-c32isprint.c b/tests/test-c32isprint.c
index d754f3dcb2..c64eec431e 100644
--- a/tests/test-c32isprint.c
+++ b/tests/test-c32isprint.c
@@ -163,7 +163,7 @@ main (int argc, char *argv[])
is = for_character ("\342\200\202", 3);
ASSERT (is != 0);
#endif
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || defined __ANDROID__ || defined __HAIKU__)
/* U+202E RIGHT-TO-LEFT OVERRIDE */
is = for_character ("\342\200\256", 3);
ASSERT (is == 0);
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
is = for_character ("\343\200\200", 3);
ASSERT (is != 0);
#endif
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__ || defined __HAIKU__)
/* U+FEFF ZERO WIDTH NO-BREAK SPACE */
is = for_character ("\357\273\277", 3);
ASSERT (is == 0);
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
is = for_character ("\360\240\200\200", 4);
ASSERT (is != 0);
#endif
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__ || defined __HAIKU__)
/* U+E0001 LANGUAGE TAG */
is = for_character ("\363\240\200\201", 4);
ASSERT (is == 0);
diff --git a/tests/test-c32ispunct.c b/tests/test-c32ispunct.c
index b720cedabb..52be41e02d 100644
--- a/tests/test-c32ispunct.c
+++ b/tests/test-c32ispunct.c
@@ -118,7 +118,11 @@ main (int argc, char *argv[])
case '{': case '|': case '}': case '~':
/* These characters are usually expected to be punctuation or
symbol characters. */
- ASSERT (is != 0);
+ #if defined __HAIKU__
+ if (!(c == '+' || c == '<' || c == '=' || c == '>'
+ || c == '^' || c == '|' || c == '~'))
+ #endif
+ ASSERT (is != 0);
break;
default:
ASSERT (is == 0);
@@ -212,7 +216,7 @@ main (int argc, char *argv[])
/* U+00BF INVERTED QUESTION MARK */
is = for_character ("\302\277", 2);
ASSERT (is != 0);
- #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
+ #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun || defined __HAIKU__)
/* U+00D7 MULTIPLICATION SIGN */
is = for_character ("\303\227", 2);
ASSERT (is != 0);
@@ -229,7 +233,7 @@ main (int argc, char *argv[])
/* U+05F3 HEBREW PUNCTUATION GERESH */
is = for_character ("\327\263", 2);
ASSERT (is != 0);
- #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun || (defined _WIN32 && !defined __CYGWIN__))
+ #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun || (defined _WIN32 && !defined __CYGWIN__) || defined __HAIKU__)
/* U+2192 RIGHTWARDS ARROW */
is = for_character ("\342\206\222", 3);
ASSERT (is != 0);
@@ -246,7 +250,7 @@ main (int argc, char *argv[])
/* U+10330 GOTHIC LETTER AHSA */
is = for_character ("\360\220\214\260", 4);
ASSERT (is == 0);
- #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
+ #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun || defined __HAIKU__)
/* U+1D100 MUSICAL SYMBOL SINGLE BARLINE */
is = for_character ("\360\235\204\200", 4);
ASSERT (is != 0);
diff --git a/tests/test-c32toupper.c b/tests/test-c32toupper.c
index 74e8b0405f..9b15374bca 100644
--- a/tests/test-c32toupper.c
+++ b/tests/test-c32toupper.c
@@ -255,7 +255,7 @@ main (int argc, char *argv[])
mb = for_character ("\302\262", 2);
ASSERT (mb.nbytes == 2);
ASSERT (memcmp (mb.buf, "\302\262", 2) == 0);
- #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__)
+ #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__ || defined __HAIKU__)
/* U+00B5 MICRO SIGN */
mb = for_character ("\302\265", 2);
ASSERT (mb.nbytes == 2);
diff --git a/tests/test-isgraph_l.c b/tests/test-isgraph_l.c
index bcb79f08db..a4bc26a037 100644
--- a/tests/test-isgraph_l.c
+++ b/tests/test-isgraph_l.c
@@ -108,7 +108,7 @@ main ()
/* U+007F <control> */
is = isgraph_l ((unsigned char) '\177', locale);
ASSERT (is == 0);
- #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__))
+ #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __HAIKU__)
/* U+00A0 NO-BREAK SPACE */
is = isgraph_l ((unsigned char) '\240', locale);
ASSERT (is != 0);
diff --git a/tests/test-islower_l.c b/tests/test-islower_l.c
index f7be19da5d..1cbebc5c16 100644
--- a/tests/test-islower_l.c
+++ b/tests/test-islower_l.c
@@ -117,7 +117,7 @@ main ()
/* U+00B2 SUPERSCRIPT TWO */
is = islower_l ((unsigned char) '\262', locale);
ASSERT (is == 0);
- #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__))
+ #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __HAIKU__)
/* U+00B5 MICRO SIGN */
is = islower_l ((unsigned char) '\265', locale);
ASSERT (is == 0);
diff --git a/tests/test-ispunct_l.c b/tests/test-ispunct_l.c
index 7f2c0e0b3c..1680732d30 100644
--- a/tests/test-ispunct_l.c
+++ b/tests/test-ispunct_l.c
@@ -93,7 +93,11 @@ test_single_locale_common (locale_t locale)
case '{': case '|': case '}': case '~':
/* These characters are usually expected to be punctuation or
symbol characters. */
- ASSERT (is != 0);
+ #if defined __HAIKU__
+ if (!(c == '+' || c == '<' || c == '=' || c == '>'
+ || c == '^' || c == '|' || c == '~'))
+ #endif
+ ASSERT (is != 0);
break;
default:
ASSERT (is == 0);
@@ -135,7 +139,7 @@ main ()
is = ispunct_l ((unsigned char) '\277', locale);
ASSERT (is != 0);
#endif
- #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun)
+ #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sun || defined __HAIKU__)
/* U+00D7 MULTIPLICATION SIGN */
is = ispunct_l ((unsigned char) '\327', locale);
ASSERT (is != 0);
--
2.52.0
