From 18181eb54858b6ad967d745e5c8c96a74cfb1a01 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 24 Feb 2024 13:56:30 +0100 Subject: [PATCH] striconveha tests: Avoid test failure on macOS 12.5. * tests/test-striconveha.c (main): Skip transliteration tests when using Apple's modified GNU libiconv or the bastard Apple iconv. --- ChangeLog | 6 ++++++ tests/test-striconveha.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e836df16d..a311bc4996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-02-24 Bruno Haible + + striconveha tests: Avoid test failure on macOS 12.5. + * tests/test-striconveha.c (main): Skip transliteration tests when using + Apple's modified GNU libiconv or the bastard Apple iconv. + 2024-02-21 Bruno Haible c-strtold: Use strtold_l when available (regr. 2019-01-31). diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c index c401177e29..376f3cb603 100644 --- a/tests/test-striconveha.c +++ b/tests/test-striconveha.c @@ -406,7 +406,7 @@ main () } # endif -# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105 +# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || (_LIBICONV_VERSION >= 0x0105 && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) /* Test conversion from UTF-8 to ISO-8859-1 with transliteration. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -586,7 +586,7 @@ main () } # endif -# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105 +# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || (_LIBICONV_VERSION >= 0x0105 && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) /* Test conversion from UTF-8 to ISO-8859-1 with transliteration. */ for (h = 0; h < SIZEOF (handlers); h++) { -- 2.39.5