From 989bb0bace991b2ded402431210837510815a40e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 1 Sep 2024 00:13:39 +0200 Subject: [PATCH] tests: Avoid some test failures on OpenBSD 7.5. * tests/test-c32isalpha.c (main): Disable tests that fail on OpenBSD 7.5. * tests/test-c32iscntrl.c (main): Likewise. * 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. --- ChangeLog | 12 ++++++++++++ tests/test-c32isalpha.c | 2 +- tests/test-c32iscntrl.c | 6 +++--- tests/test-c32isgraph.c | 6 +++--- tests/test-c32islower.c | 2 +- tests/test-c32isprint.c | 6 +++--- tests/test-c32ispunct.c | 2 +- tests/test-c32toupper.c | 2 +- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5de491a91..a523d9c77c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2024-08-31 Bruno Haible + + tests: Avoid some test failures on OpenBSD 7.5. + * tests/test-c32isalpha.c (main): Disable tests that fail on + OpenBSD 7.5. + * tests/test-c32iscntrl.c (main): Likewise. + * 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. + 2024-08-31 Bruno Haible iswxdigit: Work around OpenBSD, Android, Haiku bug. diff --git a/tests/test-c32isalpha.c b/tests/test-c32isalpha.c index cd96aeca4a..728d88392d 100644 --- a/tests/test-c32isalpha.c +++ b/tests/test-c32isalpha.c @@ -186,7 +186,7 @@ main (int argc, char *argv[]) /* U+3001 IDEOGRAPHIC COMMA */ is = for_character ("\343\200\201", 3); ASSERT (is == 0); - #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) /* U+FF11 FULLWIDTH DIGIT ONE */ is = for_character ("\357\274\221", 3); ASSERT (is == 0); diff --git a/tests/test-c32iscntrl.c b/tests/test-c32iscntrl.c index cd7fc097eb..5d48bfc004 100644 --- a/tests/test-c32iscntrl.c +++ b/tests/test-c32iscntrl.c @@ -145,7 +145,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 _AIX || defined __sun || defined __CYGWIN__) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) /* U+202E RIGHT-TO-LEFT OVERRIDE */ is = for_character ("\342\200\256", 3); ASSERT (is != 0); @@ -153,7 +153,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 _AIX || defined __sun || defined __CYGWIN__) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) /* U+FEFF ZERO WIDTH NO-BREAK SPACE */ is = for_character ("\357\273\277", 3); ASSERT (is != 0); @@ -161,7 +161,7 @@ main (int argc, char *argv[]) /* U+20000 */ 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 _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #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__)) /* 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 9365ad4486..eb867a8fe2 100644 --- a/tests/test-c32isgraph.c +++ b/tests/test-c32isgraph.c @@ -166,7 +166,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 _AIX || defined __sun || defined __CYGWIN__) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) /* U+202E RIGHT-TO-LEFT OVERRIDE */ is = for_character ("\342\200\256", 3); ASSERT (is == 0); @@ -174,7 +174,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 _AIX || defined __sun || defined __CYGWIN__) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) /* U+FEFF ZERO WIDTH NO-BREAK SPACE */ is = for_character ("\357\273\277", 3); ASSERT (is == 0); @@ -184,7 +184,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 _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #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__)) /* 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 ed1de34903..66a563b40b 100644 --- a/tests/test-c32islower.c +++ b/tests/test-c32islower.c @@ -202,7 +202,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 _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #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__)) /* 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 ae0bdd7a6d..1a845b4cc1 100644 --- a/tests/test-c32isprint.c +++ b/tests/test-c32isprint.c @@ -167,7 +167,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 _AIX || defined __sun || defined __CYGWIN__) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) /* U+202E RIGHT-TO-LEFT OVERRIDE */ is = for_character ("\342\200\256", 3); ASSERT (is == 0); @@ -177,7 +177,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 _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #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__)) /* U+FEFF ZERO WIDTH NO-BREAK SPACE */ is = for_character ("\357\273\277", 3); ASSERT (is == 0); @@ -187,7 +187,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 _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #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__)) /* 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 e6b82b8339..d608921b13 100644 --- a/tests/test-c32ispunct.c +++ b/tests/test-c32ispunct.c @@ -255,7 +255,7 @@ main (int argc, char *argv[]) is = for_character ("\360\235\204\200", 4); ASSERT (is != 0); #endif - #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) /* U+E003A TAG COLON */ is = for_character ("\363\240\200\272", 4); ASSERT (is == 0); diff --git a/tests/test-c32toupper.c b/tests/test-c32toupper.c index 86239b3116..5fa9f6904f 100644 --- a/tests/test-c32toupper.c +++ b/tests/test-c32toupper.c @@ -259,7 +259,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 _AIX || defined __sun || defined __CYGWIN__) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__) /* U+00B5 MICRO SIGN */ mb = for_character ("\302\265", 2); ASSERT (mb.nbytes == 2); -- 2.39.5