From: Bruno Haible Date: Sun, 21 Oct 2018 17:59:28 +0000 (+0200) Subject: Make the intl-thread-2 test effective on Solaris 11. X-Git-Tag: v0.20~316 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c445b1f99957dab845b25af3573267c0b34ed50;p=thirdparty%2Fgettext.git Make the intl-thread-2 test effective on Solaris 11. * gettext-tools/m4/locale-de.m4: New file, based on locale-fr.m4 from gnulib. * gettext-tools/m4/Makefile.am (EXTRA_DIST): Add it. * gettext-tools/configure.ac: Invoke gt_LOCALE_DE_UTF8. * gettext-tools/tests/init-env.in: Set LOCALE_DE_UTF8. * gettext-tools/tests/intl-thread-2: Use a German instead of a Turkish locale. --- diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index c48ac1378..62a23dcff 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -464,6 +464,7 @@ gl_PROG_ANSI_CXX([CXX], [ANSICXX]) gt_LOCALE_FR gt_LOCALE_FR_UTF8 gt_LOCALE_JA +gt_LOCALE_DE_UTF8 dnl Checks for functions for the tests/*.c tests. AC_CHECK_FUNCS_ONCE([getrlimit setrlimit uselocale]) diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 907c31c0f..db732c9e6 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -49,5 +49,6 @@ examplesbuildaux_DATA = \ EXTRA_DIST = README csharpexec-test.exe \ exported.m4 \ hostname.m4 \ +locale-de.m4 \ setlocale.m4 \ siginfo.m4 diff --git a/gettext-tools/m4/locale-de.m4 b/gettext-tools/m4/locale-de.m4 new file mode 100644 index 000000000..1e56ab159 --- /dev/null +++ b/gettext-tools/m4/locale-de.m4 @@ -0,0 +1,125 @@ +# locale-de.m4 serial 1 +dnl Copyright (C) 2003, 2005-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl Determine the name of a german locale with UTF-8 encoding. +AC_DEFUN([gt_LOCALE_DE_UTF8], +[ + AC_REQUIRE([AM_LANGINFO_CODESET]) + AC_CACHE_CHECK([for a german Unicode locale], [gt_cv_locale_de_utf8], [ + AC_LANG_CONFTEST([AC_LANG_SOURCE([ +changequote(,)dnl +#include +#include +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () { + /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl + imitates locale dependent behaviour by looking at the environment + variables, and all locales use the UTF-8 encoding. */ +#if !(defined __BEOS__ || defined __HAIKU__) + /* Check whether the given locale name is recognized by the system. */ +# if defined _WIN32 && !defined __CYGWIN__ + /* On native Windows, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +# else + if (setlocale (LC_ALL, "") == NULL) return 1; +# endif + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On Mac OS X 10.3.5 (Darwin 7.5) in the de_DE locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +# if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +# endif +# ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +# endif + /* Check whether in the name of the third month, the second character + (should be U+00E4: LATIN SMALL LETTER A WITH DIAERESIS) is two bytes + long, with UTF-8 encoding. */ + t.tm_year = 1965 - 1900; t.tm_mon = 3 - 1; t.tm_mday = 29; + if (strftime (buf, sizeof (buf), "%B", &t) < 5 + || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa4) + return 1; +#endif +#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ + /* Check whether the decimal separator is a comma. + On NetBSD 3.0 in the de_DE.ISO8859-1 locale, localeconv()->decimal_point + are nl_langinfo(RADIXCHAR) are both ".". */ + if (localeconv () ->decimal_point[0] != ',') return 1; +#endif + return 0; +} +changequote([,])dnl + ])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Test for the hypothetical native Windows locale name. + if (LC_ALL=German_Germany.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_de_utf8=German_Germany.65001 + else + # None found. + gt_cv_locale_de_utf8=none + fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=de_DE LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_de_utf8=de_DE + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=de_DE.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_de_utf8=de_DE.UTF-8 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=de.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_de_utf8=de.UTF-8 + else + # None found. + gt_cv_locale_de_utf8=none + fi + fi + fi + ;; + esac + fi + rm -fr conftest* + ]) + LOCALE_DE_UTF8=$gt_cv_locale_de_utf8 + AC_SUBST([LOCALE_DE_UTF8]) +]) diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in index 5d5bb8982..cddc5f9bd 100644 --- a/gettext-tools/tests/init-env.in +++ b/gettext-tools/tests/init-env.in @@ -25,6 +25,7 @@ GLIBC2="@GLIBC2@" LOCALE_FR="@LOCALE_FR@" LOCALE_FR_UTF8="@LOCALE_FR_UTF8@" LOCALE_JA="@LOCALE_JA@" +LOCALE_DE_UTF8="@LOCALE_DE_UTF8@" host_os="@host_os@" ARCHIVE_VERSION="@ARCHIVE_VERSION@" diff --git a/gettext-tools/tests/intl-thread-2 b/gettext-tools/tests/intl-thread-2 index 2edebfe1e..038ce51f6 100755 --- a/gettext-tools/tests/intl-thread-2 +++ b/gettext-tools/tests/intl-thread-2 @@ -5,18 +5,17 @@ # different threads operate in different locales with the same encoding. # Let's use two UTF-8 locales that configure already checked for: -# French and Turkish. -# The second PO file is actually German, not Turkish, but that doesn't matter. +# French and German. test -d in-th-2 || mkdir in-th-2 -test -d in-th-2/fr_FR || mkdir in-th-2/fr_FR -test -d in-th-2/fr_FR/LC_MESSAGES || mkdir in-th-2/fr_FR/LC_MESSAGES -test -d in-th-2/tr_TR || mkdir in-th-2/tr_TR -test -d in-th-2/tr_TR/LC_MESSAGES || mkdir in-th-2/tr_TR/LC_MESSAGES +test -d in-th-2/fr || mkdir in-th-2/fr +test -d in-th-2/fr/LC_MESSAGES || mkdir in-th-2/fr/LC_MESSAGES +test -d in-th-2/de || mkdir in-th-2/de +test -d in-th-2/de/LC_MESSAGES || mkdir in-th-2/de/LC_MESSAGES : ${MSGFMT=msgfmt} -${MSGFMT} -o in-th-2/fr_FR/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-2-1.po -${MSGFMT} -o in-th-2/tr_TR/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-2-2.po +${MSGFMT} -o in-th-2/fr/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-2-1.po +${MSGFMT} -o in-th-2/de/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-2-2.po : ${DIFF=diff} cat < in-th-2.ok @@ -27,11 +26,11 @@ Schönheit EOF : ${LOCALE_FR_UTF8=fr_FR.UTF-8} -: ${LOCALE_TR_UTF8=tr_TR.UTF-8} -if test $LOCALE_FR_UTF8 != none && test $LOCALE_TR_UTF8 != none; then - prepare_locale_ fr $LOCALE_FR_UTF8 - prepare_locale_ tr $LOCALE_TR_UTF8 - ../intl-thread-2-prg $LOCALE_FR_UTF8 $LOCALE_TR_UTF8 > in-th-2.out +: ${LOCALE_DE_UTF8=de_DE.UTF-8} +if test $LOCALE_FR_UTF8 != none && test $LOCALE_DE_UTF8 != none; then + prepare_locale_ in-th-2/fr in-th-2/$LOCALE_FR_UTF8 + prepare_locale_ in-th-2/de in-th-2/$LOCALE_DE_UTF8 + ../intl-thread-2-prg $LOCALE_FR_UTF8 $LOCALE_DE_UTF8 > in-th-2.out case $? in 0) ${DIFF} in-th-2.ok in-th-2.out || Exit 1 @@ -46,9 +45,9 @@ if test $LOCALE_FR_UTF8 != none && test $LOCALE_TR_UTF8 != none; then esac else if test -f /usr/bin/localedef; then - echo "Skipping test: no french and turkish locales are installed" + echo "Skipping test: no french and german locales are installed" else - echo "Skipping test: no french and turkish locales are supported" + echo "Skipping test: no french and german locales are supported" fi Exit 77 fi