diff options
Diffstat (limited to 'main/gettext/skip-tests-musl.patch')
| -rw-r--r-- | main/gettext/skip-tests-musl.patch | 109 |
1 files changed, 29 insertions, 80 deletions
diff --git a/main/gettext/skip-tests-musl.patch b/main/gettext/skip-tests-musl.patch index 2ed677f72c..de9a6b02b3 100644 --- a/main/gettext/skip-tests-musl.patch +++ b/main/gettext/skip-tests-musl.patch @@ -1,95 +1,44 @@ ---- gettext-0.19.8.1/gettext-tools/tests/msgconv-2.old 2016-06-09 22:56:00.000000000 +0000 -+++ gettext-0.19.8.1/gettext-tools/tests/msgconv-2 2017-08-11 17:54:55.677206381 +0000 -@@ -4,6 +4,8 @@ - # Test conversion from UTF-8 to BIG5. - # Test that encoding names are case insensitive. +As upstream notes: + +# Note: This test fails on Linux with musl libc versions that don't support +# the BIG5 encoding in 'iconv'. + +diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2 +index d286cda..d96c487 100755 +--- a/gettext-tools/tests/msgconv-2 ++++ b/gettext-tools/tests/msgconv-2 +@@ -7,6 +7,8 @@ + # Note: This test fails on Linux with musl libc versions that don't support + # the BIG5 encoding in 'iconv'. +Exit 77 + cat <<\EOF > mco-test2.po # Chinese translation for GNU gettext messages. # ---- gettext-0.19.8.1/gettext-tools/tests/msgmerge-compendium-6.old 2016-06-09 22:56:00.000000000 +0000 -+++ gettext-0.19.8.1/gettext-tools/tests/msgmerge-compendium-6 2017-08-11 17:55:41.440408716 +0000 -@@ -7,6 +7,8 @@ - # mm-ko.ascii.pot mm-ko.euc-kr.po mm-ko-comp.euc-kr.po - # mm-ko.utf-8.pot mm-ko.utf-8.po mm-ko-comp.utf-8.po +diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6 +index 0afbe1e..1b2fe6b 100755 +--- a/gettext-tools/tests/msgmerge-compendium-6 ++++ b/gettext-tools/tests/msgmerge-compendium-6 +@@ -10,6 +10,8 @@ + # Note: This test fails on Linux with musl libc versions that don't support + # the EUC-KR encoding in 'iconv'. +Exit 77 + : ${MSGCONV=msgconv} - ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$abs_srcdir"/mm-ko.ascii.pot + ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$wabs_srcdir"/mm-ko.ascii.pot ---- gettext-0.19.8.1/gettext-tools/tests/xgettext-python-3.old 2016-06-09 22:56:00.000000000 +0000 -+++ gettext-0.19.8.1/gettext-tools/tests/xgettext-python-3 2017-08-11 17:54:26.533956530 +0000 -@@ -1,6 +1,8 @@ - #!/bin/sh - . "${srcdir=.}/init.sh"; path_prepend_ . ../src +diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3 +index ca0926d..2c49fd7 100755 +--- a/gettext-tools/tests/xgettext-python-3 ++++ b/gettext-tools/tests/xgettext-python-3 +@@ -6,6 +6,8 @@ + # Note: This test fails on Linux with musl libc versions that don't support + # the EUC-JP encoding in 'iconv'. +Exit 77 + - # Test Python support: --from-code option and encoding recognition. - cat <<\EOF > xg-py-3a.py ---- gettext-0.19.8.1/gettext-tools/gnulib-tests/test-striconveha.c.old 2016-06-11 13:00:04.000000000 +0000 -+++ gettext-0.19.8.1/gettext-tools/gnulib-tests/test-striconveha.c 2017-08-11 18:12:12.294469761 +0000 -@@ -308,6 +308,7 @@ - - /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ - # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun) -+ if (iconv_open("ISO-2022-JP-2", "UTF-8") != -1) { - /* Test conversions from autodetect_jp to UTF-8. */ - for (h = 0; h < SIZEOF (handlers); h++) - { -@@ -399,6 +400,7 @@ - free (result); - } - } -+ } - # endif - - # if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105 -@@ -547,6 +547,7 @@ - /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ - # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun) - /* Test conversions from autodetect_jp to UTF-8. */ -+ if (iconv_open("ISO-2022-JP-2", "UTF-8") != -1) { - for (h = 0; h < SIZEOF (handlers); h++) - { - enum iconv_ilseq_handler handler = handlers[h]; -@@ -577,6 +578,7 @@ - ASSERT (strcmp (result, expected) == 0); - free (result); - } -+ } - # endif - - # if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105 ---- gettext-0.19.8.1/gettext-tools/gnulib-tests/test-mbrtowc5.sh.old 2016-12-31 13:54:43.000000000 +0000 -+++ gettext-0.19.8.1/gettext-tools/gnulib-tests/test-mbrtowc5.sh 2017-07-30 17:29:50.879924130 +0000 -@@ -1,6 +1,2 @@ - #!/bin/sh --# Test whether the POSIX locale has encoding errors. --LC_ALL=C \ --./test-mbrtowc${EXEEXT} 5 || exit --LC_ALL=POSIX \ --./test-mbrtowc${EXEEXT} 5 -+exit 77 ---- gettext-0.19.8.1/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c.old 2016-06-11 13:00:04.000000000 +0000 -+++ gettext-0.19.8.1/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c 2017-08-11 18:26:43.888920845 +0000 -@@ -113,6 +113,7 @@ - /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ - # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun) - /* Test conversions from autodetect_jp to UTF-8. */ -+ if (iconv_open("ISO-2022-JP-2", "UTF-8") != -1) { - for (h = 0; h < SIZEOF (handlers); h++) - { - enum iconv_ilseq_handler handler = handlers[h]; -@@ -197,6 +198,7 @@ - free (result); - } - } -+ } - # endif - - #endif + #!/usr/bin/env python + # TRANSLATORS: Franois Pinard is a hero. |