From: Bruno Haible Date: Sat, 21 Dec 2019 06:32:12 +0000 (+0100) Subject: quotearg tests: Fix conflict with hard-locale tests. X-Git-Tag: v1.0~4462 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=fc3b2d4269134cc02542e9ac8f62aa1f3ad5550a;p=gnulib.git 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 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/locale/fr/LC_MESSAGES/test-quotearg.mo b/tests/locale/fr/LC_MESSAGES/test-quotearg.mo deleted file mode 100644 index 87e97e1e1f..0000000000 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 index 1ea251f459..0000000000 --- a/tests/locale/fr/LC_MESSAGES/test-quotearg.po +++ /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 \n" -#"Language-Team: Undetermined \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" 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/testlocale/fr/LC_MESSAGES/test-quotearg.mo b/tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo new file mode 100644 index 0000000000..87e97e1e1f 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 index 0000000000..1ea251f459 --- /dev/null +++ b/tests/testlocale/fr/LC_MESSAGES/test-quotearg.po @@ -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 \n" +#"Language-Team: Undetermined \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"