From fc3b2d4269134cc02542e9ac8f62aa1f3ad5550a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 Dec 2019 07:32:12 +0100 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ modules/quotearg-tests | 4 ++-- tests/test-quotearg.sh | 2 +- .../fr/LC_MESSAGES/test-quotearg.mo | Bin .../fr/LC_MESSAGES/test-quotearg.po | 0 5 files changed, 10 insertions(+), 3 deletions(-) rename tests/{locale => testlocale}/fr/LC_MESSAGES/test-quotearg.mo (100%) rename tests/{locale => testlocale}/fr/LC_MESSAGES/test-quotearg.po (100%) diff --git a/ChangeLog b/ChangeLog index f4cd93559e..b38bbe23ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-12-21 Bruno Haible + + 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 pthread-thread, lock: On z/OS, use PTHREAD_RWLOCK_INITIALIZER_NP. diff --git a/modules/quotearg-tests b/modules/quotearg-tests index 486956affc..77fde80499 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 2862f87c57..ae3315356d 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} 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 -- 2.39.5