> 2019-12-18  Bruno Haible  <br...@clisp.org>
> 
>       hard-locale: Add test.
>       * tests/test-hard-locale.c: New file.
>       * tests/locale.c: New file.
>       * modules/hard-locale-tests: New file.

The weekly continuous integration build [1] detected that this causes a
testdir build failure. Namely, the program name 'locale' conflicts with
the directory name 'locale' used by the quotearg tests.

[1] https://gitlab.com/gnulib/gnulib-ci/pipelines


2019-12-21  Bruno Haible  <br...@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.

diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index 486956a..77fde80 100644
--- 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 2862f87..ae33153 100755
--- 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}


Reply via email to