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.

diff --git a/ChangeLog b/ChangeLog
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.

diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index 486956affcaf82e4f7c0ae31b091e3ca240e4836..77fde80499ad2fe44b40864d64bbd2da1393000d 100644 (file)
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -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/test-quotearg.sh b/tests/test-quotearg.sh
index 2862f87c57802976e72f4bdb07016e0e5aa8869e..ae3315356d0e51b9f1ee2cd384d452d8dc0d4e9d 100755 (executable)
--- a/tests/test-quotearg.sh
+++ b/tests/test-quotearg.sh
@@ -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/locale/fr/LC_MESSAGES/test-quotearg.mo b/tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo
similarity index 100%
rename from tests/locale/fr/LC_MESSAGES/test-quotearg.mo
rename to tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo

diff --git a/tests/locale/fr/LC_MESSAGES/test-quotearg.po b/tests/testlocale/fr/LC_MESSAGES/test-quotearg.po
similarity index 100%
rename from tests/locale/fr/LC_MESSAGES/test-quotearg.po
rename to tests/testlocale/fr/LC_MESSAGES/test-quotearg.po