bug-gnulib@gnu.org mirror (unofficial)
 help / color / mirror / Atom feed
From: Bruno Haible <bruno@clisp.org>
To: bug-gnulib@gnu.org
Subject: quotearg tests: Avoid test failures on Solaris 11
Date: Fri, 01 Jan 2021 18:24:32 +0100	[thread overview]
Message-ID: <5650445.jxlcdHXXU1@omega> (raw)

A testdir of modules 'quotearg' and 'gettext' fails on Solaris 11
machines that don't have GNU gettext installed. Specifically on
  - Solaris 11.0, 11.3,
  - Solaris 11 OpenIndiana,
  - Solaris 11 OmniOS.

The reason is that Solaris 11 libc has a gettext() function that
supports GNU .mo files, but it does not look them up in all possible
locations in which we install them. It's fixed in Solaris 11.4.
For OpenIndiana, I've reported it at <https://www.illumos.org/issues/13423>.

This patch provides a workaround.


2021-01-01  Bruno Haible  <bruno@clisp.org>

	quotearg tests: Avoid test failures on Solaris 11.
	* modules/quotearg-tests (Makefile.am): Set host_os in
	TESTS_ENVIRONMENT.
	* tests/test-quotearg.sh: On Solaris 11 systems, make a copy of the fr/
	directory that contains the .mo file.

diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index aed92ce..dc94b34 100644
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -25,6 +25,8 @@ gt_LOCALE_FR_UTF8
 
 Makefile.am:
 TESTS += test-quotearg.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += \
+  LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
+  host_os='@host_os@'
 check_PROGRAMS += test-quotearg
 test_quotearg_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(LIB_MBRTOWC)
diff --git a/tests/test-quotearg.sh b/tests/test-quotearg.sh
index ae33153..b997867 100755
--- a/tests/test-quotearg.sh
+++ b/tests/test-quotearg.sh
@@ -22,5 +22,30 @@ if test $locale = French_France.1252; then
   locale=fr_FR.CP1252
 fi
 
-LOCALE=$locale LOCALEDIR="$srcdir/testlocale" \
+# Work around a bug on Solaris 11 systems with no GNU gettext installed.
+# See gettext/gettext-tools/tests/init.cfg.
+localedir="$srcdir/testlocale"
+if test $locale != none && test $locale != fr; then
+  case "$host_os" in
+    solaris2.11)
+      mkdir -p testlocale
+      cp -a "$srcdir/testlocale/fr" "testlocale/$locale"
+      localedir="testlocale"
+      ;;
+  esac
+fi
+
+LOCALE=$locale LOCALEDIR="$localedir" \
 ${CHECKER} ./test-quotearg${EXEEXT}
+result=$?
+
+if test $locale != none && test $locale != fr; then
+  case "$host_os" in
+    solaris2.11)
+      rm -rf "testlocale/$locale"
+      rmdir testlocale 2>/dev/null
+      ;;
+  esac
+fi
+
+exit $result



             reply	other threads:[~2021-01-01 17:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-01 17:24 Bruno Haible [this message]
2021-01-04  3:03 ` quotearg tests: Avoid test failures on Solaris 11 Bruno Haible

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5650445.jxlcdHXXU1@omega \
    --to=bruno@clisp.org \
    --cc=bug-gnulib@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).