* tests/testlocale: Renamed from tests/locale.
* modules/quotearg-tests (Files): Update.
* tests/test-quotearg.sh (LOCALEDIR): Likewise.
+2019-12-21 Bruno Haible <bruno@clisp.org>
+
+ quotearg tests: Fix conflict with hard-locale tests.
+ * tests/testlocale: Renamed from tests/locale.
+ * modules/quotearg-tests (Files): Update.
+ * tests/test-quotearg.sh (LOCALEDIR): Likewise.
+
2019-12-21 Bruno Haible <bruno@clisp.org>
pthread-thread, lock: On z/OS, use PTHREAD_RWLOCK_INITIALIZER_NP.
tests/test-quotearg.c
tests/test-quotearg.h
tests/macros.h
-tests/locale/fr/LC_MESSAGES/test-quotearg.po
-tests/locale/fr/LC_MESSAGES/test-quotearg.mo
+tests/testlocale/fr/LC_MESSAGES/test-quotearg.po
+tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo
m4/locale-fr.m4
m4/codeset.m4
+++ /dev/null
-# Message catalog that maps the ASCII replacements for single-quote characters
-# to real single-quote characters.
-# The header entry is commented out on purpose, so that gettext() performs no
-# no character set conversion from the PO file's encoding to the locale
-# encoding. This allows us to use the same PO file in various locales.
-#msgid ""
-#msgstr ""
-#"Project-Id-Version: GNU gnulib\n"
-#"PO-Revision-Date: 2009-01-26 01:02+01:00\n"
-#"Last-Translator: Eric Blake <ebb9@byu.net>\n"
-#"Language-Team: Undetermined <und@li.org>\n"
-#"MIME-Version: 1.0\n"
-#"Content-Type: text/plain; charset=UTF-8\n"
-#"Content-Transfer-Encoding: 8bit\n"
-
-msgid "`"
-msgstr "\302\253"
-
-msgid "'"
-msgstr "\302\273"
locale=fr_FR.CP1252
fi
-LOCALE=$locale LOCALEDIR="$srcdir/locale" \
+LOCALE=$locale LOCALEDIR="$srcdir/testlocale" \
${CHECKER} ./test-quotearg${EXEEXT}
--- /dev/null
+# Message catalog that maps the ASCII replacements for single-quote characters
+# to real single-quote characters.
+# The header entry is commented out on purpose, so that gettext() performs no
+# no character set conversion from the PO file's encoding to the locale
+# encoding. This allows us to use the same PO file in various locales.
+#msgid ""
+#msgstr ""
+#"Project-Id-Version: GNU gnulib\n"
+#"PO-Revision-Date: 2009-01-26 01:02+01:00\n"
+#"Last-Translator: Eric Blake <ebb9@byu.net>\n"
+#"Language-Team: Undetermined <und@li.org>\n"
+#"MIME-Version: 1.0\n"
+#"Content-Type: text/plain; charset=UTF-8\n"
+#"Content-Transfer-Encoding: 8bit\n"
+
+msgid "`"
+msgstr "\302\253"
+
+msgid "'"
+msgstr "\302\273"