]> Savannah Git Hosting - gnulib.git/commitdiff
quotearg tests: Fix conflict with hard-locale tests.
authorBruno Haible <bruno@clisp.org>
Sat, 21 Dec 2019 06:32:12 +0000 (07:32 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 21 Dec 2019 06:32:12 +0000 (07:32 +0100)
* tests/testlocale: Renamed from tests/locale.
* modules/quotearg-tests (Files): Update.
* tests/test-quotearg.sh (LOCALEDIR): Likewise.

ChangeLog
modules/quotearg-tests
tests/locale/fr/LC_MESSAGES/test-quotearg.mo [deleted file]
tests/locale/fr/LC_MESSAGES/test-quotearg.po [deleted file]
tests/test-quotearg.sh
tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo [new file with mode: 0644]
tests/testlocale/fr/LC_MESSAGES/test-quotearg.po [new file with mode: 0644]

index f4cd93559ea2bbd280b870cc7adb29a51933e2f0..b38bbe23ab1783aa6e1c6e5b97dbe3e0c5130251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
index 486956affcaf82e4f7c0ae31b091e3ca240e4836..77fde80499ad2fe44b40864d64bbd2da1393000d 100644 (file)
@@ -6,8 +6,8 @@ tests/test-quotearg.sh
 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
 
diff --git a/tests/locale/fr/LC_MESSAGES/test-quotearg.mo b/tests/locale/fr/LC_MESSAGES/test-quotearg.mo
deleted file mode 100644 (file)
index 87e97e1..0000000
Binary files a/tests/locale/fr/LC_MESSAGES/test-quotearg.mo and /dev/null differ
diff --git a/tests/locale/fr/LC_MESSAGES/test-quotearg.po b/tests/locale/fr/LC_MESSAGES/test-quotearg.po
deleted file mode 100644 (file)
index 1ea251f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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"
index 2862f87c57802976e72f4bdb07016e0e5aa8869e..ae3315356d0e51b9f1ee2cd384d452d8dc0d4e9d 100755 (executable)
@@ -22,5 +22,5 @@ if test $locale = French_France.1252; then
   locale=fr_FR.CP1252
 fi
 
-LOCALE=$locale LOCALEDIR="$srcdir/locale" \
+LOCALE=$locale LOCALEDIR="$srcdir/testlocale" \
 ${CHECKER} ./test-quotearg${EXEEXT}
diff --git a/tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo b/tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo
new file mode 100644 (file)
index 0000000..87e97e1
Binary files /dev/null and b/tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo differ
diff --git a/tests/testlocale/fr/LC_MESSAGES/test-quotearg.po b/tests/testlocale/fr/LC_MESSAGES/test-quotearg.po
new file mode 100644 (file)
index 0000000..1ea251f
--- /dev/null
@@ -0,0 +1,20 @@
+# 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"