quotearg tests: Fix test failure (regression yesterday).

* tests/testlocale/fr/LC_MESSAGES/gnulib.po: Renamed from
tests/testlocale/fr/LC_MESSAGES/test-quotearg.po.
* tests/testlocale/fr/LC_MESSAGES/gnulib.mo: Renamed from
tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo.
* tests/test-quotearg.c (main): Use bindtextdomain for the domain
"gnulib", not "test-quotearg".
* tests/test-quotearg.sh: Fix typo in comments.
* modules/quotearg-tests (Files): Update.

diff --git a/ChangeLog b/ChangeLog
index 322b1bac9926c37bf0ab3351a522ab79e21d750e..e740515f0696478bf209690f5e0e62644188311a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-09  Bruno Haible  <bruno@clisp.org>
+
+       quotearg tests: Fix test failure (regression yesterday).
+       * tests/testlocale/fr/LC_MESSAGES/gnulib.po: Renamed from
+       tests/testlocale/fr/LC_MESSAGES/test-quotearg.po.
+       * tests/testlocale/fr/LC_MESSAGES/gnulib.mo: Renamed from
+       tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo.
+       * tests/test-quotearg.c (main): Use bindtextdomain for the domain
+       "gnulib", not "test-quotearg".
+       * tests/test-quotearg.sh: Fix typo in comments.
+       * modules/quotearg-tests (Files): Update.
+
 2024-12-08  Bruno Haible  <bruno@clisp.org>
 
        Document the new approach for gnulib localization.

diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index d297f0b0aac3b8054501d609ca59bc05c3068c26..22223a953432a4c5d76ee9f1b8ac71b13e39356b 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/testlocale/fr/LC_MESSAGES/test-quotearg.po
-tests/testlocale/fr/LC_MESSAGES/test-quotearg.mo
+tests/testlocale/fr/LC_MESSAGES/gnulib.po
+tests/testlocale/fr/LC_MESSAGES/gnulib.mo
 m4/locale-fr.m4
 m4/codeset.m4
 

diff --git a/tests/test-quotearg.c b/tests/test-quotearg.c
index 0283f1ca1c246c358a4a7038947fa64ad1be4f4d..84bead740299468c6f43899d3cc9d67ddb309266 100644 (file)
--- a/tests/test-quotearg.c
+++ b/tests/test-quotearg.c
@@ -82,8 +82,7 @@ main (_GL_UNUSED int argc, char *argv[])
         fputs ("Skipping test: no french Unicode locale is installed\n", stderr);
         return 77;
       }
-    textdomain ("test-quotearg");
-    bindtextdomain ("test-quotearg", getenv ("LOCALEDIR"));
+    bindtextdomain ("gnulib", getenv ("LOCALEDIR"));
 
     set_quoting_style (NULL, locale_quoting_style);
     compare_strings (use_quotearg_buffer, &locale_results[0].group1, false);

diff --git a/tests/test-quotearg.sh b/tests/test-quotearg.sh
index e11b66783a1998ebc3b99aec80b57eaec7a0a73d..3d895a15347cab0e60d5174e4564e750a668db58 100755 (executable)
--- a/tests/test-quotearg.sh
+++ b/tests/test-quotearg.sh
@@ -14,7 +14,7 @@ fi
 
 # Work around a limitation of gettext() on native Windows in gettext 0.18.1:
 # the locale identifiers in the environment variables LC_ALL etc. have to
-# be in Unix conventions, not in native Window conventions.
+# be in Unix conventions, not in native Windows conventions.
 if test $locale = French_France.65001; then
   locale=fr_FR.UTF-8
 fi

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

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