From: Bruno Haible Date: Wed, 16 Aug 2023 19:42:46 +0000 (+0200) Subject: tests: Avoid some test failures on Slackware 13.37. X-Git-Tag: v1.0~900 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=cbed00c448e150d73d7d4a00882d51cad9ba7aa9;p=gnulib.git tests: Avoid some test failures on Slackware 13.37. Make last commit actually work. --- diff --git a/tests/test-c32isalnum.c b/tests/test-c32isalnum.c index b1e3659cb8..051e3004b8 100644 --- a/tests/test-c32isalnum.c +++ b/tests/test-c32isalnum.c @@ -212,7 +212,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isalpha.c b/tests/test-c32isalpha.c index 1b3751db2c..f0409ff221 100644 --- a/tests/test-c32isalpha.c +++ b/tests/test-c32isalpha.c @@ -210,7 +210,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isblank.c b/tests/test-c32isblank.c index 6e91742611..71ab86f46a 100644 --- a/tests/test-c32isblank.c +++ b/tests/test-c32isblank.c @@ -169,7 +169,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32iscntrl.c b/tests/test-c32iscntrl.c index 81b9344ee0..1d1e2184aa 100644 --- a/tests/test-c32iscntrl.c +++ b/tests/test-c32iscntrl.c @@ -171,7 +171,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isdigit.c b/tests/test-c32isdigit.c index 8c7ebcab70..3af7752a80 100644 --- a/tests/test-c32isdigit.c +++ b/tests/test-c32isdigit.c @@ -183,7 +183,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isgraph.c b/tests/test-c32isgraph.c index f41d3ec991..20b4b20aae 100644 --- a/tests/test-c32isgraph.c +++ b/tests/test-c32isgraph.c @@ -194,7 +194,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32islower.c b/tests/test-c32islower.c index 6f1e2a946a..5052d1d057 100644 --- a/tests/test-c32islower.c +++ b/tests/test-c32islower.c @@ -267,7 +267,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isprint.c b/tests/test-c32isprint.c index fdabc2c637..57d16e0d85 100644 --- a/tests/test-c32isprint.c +++ b/tests/test-c32isprint.c @@ -197,7 +197,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32ispunct.c b/tests/test-c32ispunct.c index 792ff61a12..5167e89cf9 100644 --- a/tests/test-c32ispunct.c +++ b/tests/test-c32ispunct.c @@ -256,7 +256,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isspace.c b/tests/test-c32isspace.c index 0ca5dea317..83f4de7099 100644 --- a/tests/test-c32isspace.c +++ b/tests/test-c32isspace.c @@ -165,7 +165,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isupper.c b/tests/test-c32isupper.c index 8cef611a41..7a07a54535 100644 --- a/tests/test-c32isupper.c +++ b/tests/test-c32isupper.c @@ -259,7 +259,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32isxdigit.c b/tests/test-c32isxdigit.c index 43ef7f5556..8d4bc1375c 100644 --- a/tests/test-c32isxdigit.c +++ b/tests/test-c32isxdigit.c @@ -200,7 +200,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32rtomb.c b/tests/test-c32rtomb.c index ffdc780199..76a4071c63 100644 --- a/tests/test-c32rtomb.c +++ b/tests/test-c32rtomb.c @@ -156,7 +156,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32snrtombs.c b/tests/test-c32snrtombs.c index 0dee9c0a2e..ee50de0a0d 100644 --- a/tests/test-c32snrtombs.c +++ b/tests/test-c32snrtombs.c @@ -160,7 +160,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32srtombs.c b/tests/test-c32srtombs.c index e6c7a32d6e..58277ea403 100644 --- a/tests/test-c32srtombs.c +++ b/tests/test-c32srtombs.c @@ -160,7 +160,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32stombs.c b/tests/test-c32stombs.c index 69af9d28bb..2de33106d5 100644 --- a/tests/test-c32stombs.c +++ b/tests/test-c32stombs.c @@ -139,7 +139,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32tolower.c b/tests/test-c32tolower.c index 4141e58d85..e6dee2645b 100644 --- a/tests/test-c32tolower.c +++ b/tests/test-c32tolower.c @@ -336,7 +336,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-c32toupper.c b/tests/test-c32toupper.c index 7047afc504..a7c973c930 100644 --- a/tests/test-c32toupper.c +++ b/tests/test-c32toupper.c @@ -348,7 +348,7 @@ main (int argc, char *argv[]) case '4': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-mbrtoc16.c b/tests/test-mbrtoc16.c index 3e1d29eba7..99530efc0b 100644 --- a/tests/test-mbrtoc16.c +++ b/tests/test-mbrtoc16.c @@ -361,7 +361,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-mbrtoc32.c b/tests/test-mbrtoc32.c index f7a5b24e2a..e9676772ed 100644 --- a/tests/test-mbrtoc32.c +++ b/tests/test-mbrtoc32.c @@ -360,7 +360,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-mbsnrtoc32s.c b/tests/test-mbsnrtoc32s.c index 74ba643eb4..0c98a6a5a0 100644 --- a/tests/test-mbsnrtoc32s.c +++ b/tests/test-mbsnrtoc32s.c @@ -315,7 +315,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-mbsrtoc32s.c b/tests/test-mbsrtoc32s.c index 0cbbbbd870..d0157c69fd 100644 --- a/tests/test-mbsrtoc32s.c +++ b/tests/test-mbsrtoc32s.c @@ -315,7 +315,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif diff --git a/tests/test-mbstoc32s.c b/tests/test-mbstoc32s.c index 7bcfe1b03c..0827501094 100644 --- a/tests/test-mbstoc32s.c +++ b/tests/test-mbstoc32s.c @@ -263,7 +263,7 @@ main (int argc, char *argv[]) case '5': /* Locale encoding is GB18030. */ - #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun || (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15)) + #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun)) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); return 77; #endif