From: Bruno Haible Date: Wed, 25 Aug 2021 18:50:34 +0000 (+0200) Subject: Avoid a test failure of the intl-6 test on Cygwin. X-Git-Tag: v0.21.1~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30c7860b3842dd035a7da81de1e7761960516a6d;p=thirdparty%2Fgettext.git Avoid a test failure of the intl-6 test on Cygwin. * gettext-tools/tests/intl-6: On Cygwin, test only the LOCALE_FR_UTF8, not the LOCALE_FR locale. --- diff --git a/gettext-tools/tests/intl-6 b/gettext-tools/tests/intl-6 index 0e91569f8..970c58caf 100755 --- a/gettext-tools/tests/intl-6 +++ b/gettext-tools/tests/intl-6 @@ -19,10 +19,22 @@ EOF : ${LOCALE_FR=fr_FR} : ${LOCALE_FR_UTF8=fr_FR.UTF-8} if test $LOCALE_FR != none; then - prepare_locale_ in-6/fr in-6/$LOCALE_FR - ../intl-6-prg in-6 $LOCALE_FR > in-6.tmp || Exit 1 - LC_ALL=C tr -d '\r' < in-6.tmp > in-6.out || Exit 1 - ${DIFF} in-6.ok in-6.out || Exit 1 + case "$host_os" in + cygwin*) + # On Cygwin, file names are interpreted according to the character + # encoding of the current locale, see + # . + # Therefore arbitrary Unicode characters are only supported in UTF-8 + # locales (including "C.UTF-8") and in the "C" locale. In particular, + # they are not supported in the fr_FR.ISO-8859-1 locale. + ;; + *) + prepare_locale_ in-6/fr in-6/$LOCALE_FR + ../intl-6-prg in-6 $LOCALE_FR > in-6.tmp || Exit 1 + LC_ALL=C tr -d '\r' < in-6.tmp > in-6.out || Exit 1 + ${DIFF} in-6.ok in-6.out || Exit 1 + ;; + esac fi if test $LOCALE_FR_UTF8 != none; then prepare_locale_ in-6/fr in-6/$LOCALE_FR_UTF8