From: Bruno Haible <bruno@clisp.org>
Date: Thu, 19 Jun 2025 20:34:27 +0000 (+0200)
Subject: Reject the dysfunctional gettext in Solaris libc, other than Solaris 11.4.
X-Git-Tag: v0.26~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec07a48b8fd1939b62d03fb84800560ceb2b577f;p=thirdparty%2Fgettext.git

Reject the dysfunctional gettext in Solaris libc, other than Solaris 11.4.

This fixes a 'make installcheck' failure.

<https://www.illumos.org/issues/13423> has been reported more than 4 years ago.
I don't have hope that they will fix it, ever.

* gettext-runtime/m4/gettext.m4 (AM_GNU_GETTEXT): On Solaris other than
Solaris 11.4, don't use the gettext() function in libc.
* gettext-tools/tests/init.cfg (prepare_locale_): Remove function.
* gettext-tools/tests/format-c-3: Remove prepare_locale_ invocations.
* gettext-tools/tests/format-c-4: Likewise.
* gettext-tools/tests/format-c-5: Likewise.
* gettext-tools/tests/intl-0: Likewise.
* gettext-tools/tests/intl-1: Likewise.
* gettext-tools/tests/intl-2: Likewise.
* gettext-tools/tests/intl-3: Likewise.
* gettext-tools/tests/intl-4: Likewise.
* gettext-tools/tests/intl-6: Likewise.
* gettext-tools/tests/intl-7: Likewise.
* gettext-tools/tests/intl-thread-1: Likewise.
* gettext-tools/tests/intl-thread-2: Likewise.
* gettext-tools/tests/intl-thread-3: Likewise.
* gettext-tools/tests/lang-bash: Likewise.
* gettext-tools/tests/lang-c: Likewise.
* gettext-tools/tests/lang-c++: Likewise.
* gettext-tools/tests/lang-c++20: Likewise.
* gettext-tools/tests/lang-c++26: Likewise.
* gettext-tools/tests/lang-clisp: Likewise.
* gettext-tools/tests/lang-csharp: Likewise.
* gettext-tools/tests/lang-d: Likewise.
* gettext-tools/tests/lang-gawk: Likewise.
* gettext-tools/tests/lang-go: Likewise.
* gettext-tools/tests/lang-guile: Likewise.
* gettext-tools/tests/lang-java: Likewise.
* gettext-tools/tests/lang-javascript: Likewise.
* gettext-tools/tests/lang-librep: Likewise.
* gettext-tools/tests/lang-lua: Likewise.
* gettext-tools/tests/lang-modula2: Likewise.
* gettext-tools/tests/lang-objc: Likewise.
* gettext-tools/tests/lang-pascal: Likewise.
* gettext-tools/tests/lang-perl-1: Likewise.
* gettext-tools/tests/lang-perl-2: Likewise.
* gettext-tools/tests/lang-php: Likewise.
* gettext-tools/tests/lang-python-1: Likewise.
* gettext-tools/tests/lang-python-2: Likewise.
* gettext-tools/tests/lang-ruby: Likewise.
* gettext-tools/tests/lang-rust: Likewise.
* gettext-tools/tests/lang-sh: Likewise.
* gettext-tools/tests/lang-smalltalk: Likewise.
* gettext-tools/tests/lang-tcl: Likewise.
* gettext-tools/tests/lang-vala: Likewise.
* gettext-tools/tests/msgfmt-20: Likewise.
* gettext-tools/tests/plural-1: Likewise.
* NEWS: Mention the change.
---

diff --git a/NEWS b/NEWS
index f364ebb3e..7e24a48a5 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ Version 0.26 - July 2025
       heuristic by using a comment of the form /* xgettext: c-format */.
 
 # Bug fixes:
+  - The AM_GNU_GETTEXT macro now rejects the dysfunctional gettext() function
+    in libc of Solaris 11.[0-3], Solaris OpenIndiana, and Solaris OmniOS.
   - The AM_GNU_GETTEXT macro now recognizes, on MSVC, the GNU libintl built
     as a shared library.
 
diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 908f829c3..67b6d4eae 100644
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,5 +1,5 @@
 # gettext.m4
-# serial 82 (gettext-0.26)
+# serial 83 (gettext-0.26)
 dnl Copyright (C) 1995-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -193,7 +193,28 @@ $gt_revision_test_code
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
+            [dnl Solaris 11.[0-3] doesn't strip the CODESET part from the locale name,
+             dnl when looking for a message catalog. E.g. when the locale is fr_FR.UTF-8,
+             dnl on Solaris 11.[0-3] it looks for
+             dnl   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl Similarly, on Solaris 11 OpenIndiana and Solaris 11 OmniOS it looks only for
+             dnl   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl Reported at <https://www.illumos.org/issues/13423>.
+             dnl On Solaris 11.4 this is fixed: it looks for
+             dnl   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr_FR/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr/LC_MESSAGES/<domain>.mo
+             if test "`uname -sr`" = 'SunOS 5.11'; then
+               case `uname -v` in
+                 11.4 | 11.4.*) eval "$gt_func_gnugettext_libc=yes" ;;
+                 *)             eval "$gt_func_gnugettext_libc=no" ;;
+               esac
+             else
+               eval "$gt_func_gnugettext_libc=yes"
+             fi
+            ],
             [eval "$gt_func_gnugettext_libc=no"])])
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index 3089d36f1..b3e7fd64e 100755
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -66,11 +66,9 @@ else
   : ${LOCALE_FR=fr_FR}
   : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
   if test $LOCALE_FR != none; then
-    prepare_locale_ fc3-dir/fr fc3-dir/$LOCALE_FR
     LANGUAGE= ../fc3 $LOCALE_FR || Exit 1
   fi
   if test $LOCALE_FR_UTF8 != none; then
-    prepare_locale_ fc3-dir/fr fc3-dir/$LOCALE_FR_UTF8
     LANGUAGE= ../fc3 $LOCALE_FR_UTF8 || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index 8f2d75c0e..1a64ed5bc 100755
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -74,11 +74,9 @@ else
   : ${LOCALE_FR=fr_FR}
   : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
   if test $LOCALE_FR != none; then
-    prepare_locale_ fc4-dir/fr fc4-dir/$LOCALE_FR
     LANGUAGE= ../fc4 $LOCALE_FR || Exit 1
   fi
   if test $LOCALE_FR_UTF8 != none; then
-    prepare_locale_ fc4-dir/fr fc4-dir/$LOCALE_FR_UTF8
     LANGUAGE= ../fc4 $LOCALE_FR_UTF8 || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 1a70c7577..fd35faf80 100755
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -69,7 +69,6 @@ else
 
   skipped=true
 
-  prepare_locale_ fa fa_IR
   LANGUAGE= ../fc5 fa_IR
   case $? in
     0) skipped=false ;;
@@ -77,7 +76,6 @@ else
     *) Exit 1;;
   esac
 
-  prepare_locale_ fa fa_IR.UTF-8
   LANGUAGE= ../fc5 fa_IR.UTF-8
   case $? in
     0) skipped=false ;;
@@ -91,7 +89,6 @@ else
   test -d ar/LC_MESSAGES || mkdir ar/LC_MESSAGES
   cp fa/LC_MESSAGES/fc5.mo ar/LC_MESSAGES/fc5.mo
 
-  prepare_locale_ ar ar_EG
   LANGUAGE= ../fc5 ar_EG
   case $? in
     0) skipped=false ;;
@@ -99,7 +96,6 @@ else
     *) Exit 1;;
   esac
 
-  prepare_locale_ ar ar_EG.UTF-8
   LANGUAGE= ../fc5 ar_EG.UTF-8
   case $? in
     0) skipped=false ;;
diff --git a/gettext-tools/tests/init.cfg b/gettext-tools/tests/init.cfg
index 4063903e4..fc1328837 100644
--- a/gettext-tools/tests/init.cfg
+++ b/gettext-tools/tests/init.cfg
@@ -3,43 +3,6 @@
 # Set environment variables for the tests.
 . ../tests/init-env
 
-prepare_locale_ ()
-{
-  # Solaris 11.[0-3] doesn't strip the CODESET part from the locale name,
-  # when looking for a message catalog. E.g. when the locale is fr_FR.UTF-8,
-  # on Solaris 11.[0-3] it looks for
-  #   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
-  #   <LOCALEDIR>/fr.UTF-8/LC_MESSAGES/<domain>.mo
-  # Similarly, on Solaris 11 OpenIndiana and Solaris 11 OmniOS it looks only for
-  #   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
-  # Reported at <https://www.illumos.org/issues/13423>.
-  # On Solaris 11.4 this is fixed: it looks for
-  #   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
-  #   <LOCALEDIR>/fr.UTF-8/LC_MESSAGES/<domain>.mo
-  #   <LOCALEDIR>/fr_FR/LC_MESSAGES/<domain>.mo
-  #   <LOCALEDIR>/fr/LC_MESSAGES/<domain>.mo
-  # Create a directory link with CODESET, to work around this.
-  if test "$1" != "$2" && test "$GLIBC2" = no; then
-    case "$host_os" in
-      solaris2.11)
-        # Copy the contents of "$1" into "$2", preserving the existing contents
-        # of "$2".
-        mkdir -p "$2"
-        for d in `cd "$1" && find . -type d -print | grep -v '^[.]$' | sed -e 's|^[.]/||'`; do
-          mkdir -p "$2/$d"
-        done
-        for f in `cd "$1" && find . -type f -print`; do
-          if test -f "$2/$f"; then
-            :
-          else
-            ln "$1/$f" "$2/$f"
-          fi
-        done
-        ;;
-    esac
-  fi
-}
-
 # func_filter_POT_Creation_Date inputfile outputfile
 # creates outputfile from inputfile, filtering out any 'POT-Creation-Date' line.
 func_filter_POT_Creation_Date ()
diff --git a/gettext-tools/tests/intl-0 b/gettext-tools/tests/intl-0
index e19b86cc0..5750f5bd2 100755
--- a/gettext-tools/tests/intl-0
+++ b/gettext-tools/tests/intl-0
@@ -19,7 +19,6 @@ EOF
 LC_ALL=C tr -d '\r' < in-0.tmp > in-0-1.out || Exit 1
 ${DIFF} in-0.ok in-0-1.out || Exit 1
 
-prepare_locale_ in-0/C in-0/C.UTF-8
 ../intl-1-prg in-0 C.UTF-8 > in-0.tmp || Exit 1
 LC_ALL=C tr -d '\r' < in-0.tmp > in-0-2.out || Exit 1
 ${DIFF} in-0.ok in-0-2.out || Exit 1
diff --git a/gettext-tools/tests/intl-1 b/gettext-tools/tests/intl-1
index b572d0d6f..f9bace6a3 100755
--- a/gettext-tools/tests/intl-1
+++ b/gettext-tools/tests/intl-1
@@ -18,13 +18,11 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ in-1/fr in-1/$LOCALE_FR
   ../intl-1-prg in-1 $LOCALE_FR > in-1.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-1.tmp > in-1.out || Exit 1
   ${DIFF} in-1.ok in-1.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ in-1/fr in-1/$LOCALE_FR_UTF8
   ../intl-1-prg in-1 $LOCALE_FR_UTF8 > in-1.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-1.tmp > in-1.out || Exit 1
   ${DIFF} in-1.ok in-1.out || Exit 1
diff --git a/gettext-tools/tests/intl-2 b/gettext-tools/tests/intl-2
index f7cbbd43b..0d18f3ccd 100755
--- a/gettext-tools/tests/intl-2
+++ b/gettext-tools/tests/intl-2
@@ -28,8 +28,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ in-2-1/fr in-2-1/$LOCALE_FR
-  prepare_locale_ in-2-2/fr in-2-2/$LOCALE_FR
   ../intl-1-prg in-2-1 $LOCALE_FR > in-2.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-2.tmp > in-2.out || Exit 1
   ${DIFF} in-2-1.ok in-2.out || Exit 1
@@ -38,8 +36,6 @@ if test $LOCALE_FR != none; then
   ${DIFF} in-2-1.ok in-2.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ in-2-1/fr in-2-1/$LOCALE_FR_UTF8
-  prepare_locale_ in-2-2/fr in-2-2/$LOCALE_FR_UTF8
   ../intl-1-prg in-2-1 $LOCALE_FR_UTF8 > in-2.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-2.tmp > in-2.out || Exit 1
   ${DIFF} in-2-2.ok in-2.out || Exit 1
diff --git a/gettext-tools/tests/intl-3 b/gettext-tools/tests/intl-3
index c283bb9ee..780162170 100755
--- a/gettext-tools/tests/intl-3
+++ b/gettext-tools/tests/intl-3
@@ -40,8 +40,6 @@ fi
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ in-3-1/fr in-3-1/$LOCALE_FR
-  prepare_locale_ in-3-2/fr in-3-2/$LOCALE_FR
   ../intl-3-prg in-3-1 $LOCALE_FR ISO-8859-1 > in-3.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-3.tmp > in-3.out || Exit 1
   ${DIFF} in-3-1.ok in-3.out || Exit 1
@@ -56,8 +54,6 @@ if test $LOCALE_FR != none; then
   ${DIFF} in-3-2.ok in-3.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ in-3-1/fr in-3-1/$LOCALE_FR_UTF8
-  prepare_locale_ in-3-2/fr in-3-2/$LOCALE_FR_UTF8
   ../intl-3-prg in-3-1 $LOCALE_FR_UTF8 ISO-8859-1 > in-3.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-3.tmp > in-3.out || Exit 1
   ${DIFF} in-3-1.ok in-3.out || Exit 1
diff --git a/gettext-tools/tests/intl-4 b/gettext-tools/tests/intl-4
index 3b5fce795..114535320 100755
--- a/gettext-tools/tests/intl-4
+++ b/gettext-tools/tests/intl-4
@@ -19,7 +19,6 @@ ${MSGFMT} -o in-4/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-4.po
 # traditional german locale.
 : ${LOCALE_FR=fr_FR}
 if test $LOCALE_FR != none; then
-  prepare_locale_ in-4/fr in-4/$LOCALE_FR
   ../intl-4-prg $LOCALE_FR || Exit 1
 else
   if test -f /usr/bin/localedef; then
diff --git a/gettext-tools/tests/intl-6 b/gettext-tools/tests/intl-6
index b5c26f189..1f704845d 100755
--- a/gettext-tools/tests/intl-6
+++ b/gettext-tools/tests/intl-6
@@ -30,7 +30,6 @@ if test $LOCALE_FR != none; then
       # they are not supported in the fr_FR.ISO-8859-1 locale.
       ;;
     *)
-      prepare_locale_ in-6/fr in-6/$LOCALE_FR
       ../intl-6-prg in-6 $LOCALE_FR > in-6.tmp || Exit 1
       LC_ALL=C tr -d '\r' < in-6.tmp > in-6.out || Exit 1
       ${DIFF} in-6.ok in-6.out || Exit 1
@@ -38,7 +37,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ in-6/fr in-6/$LOCALE_FR_UTF8
   ../intl-6-prg in-6 $LOCALE_FR_UTF8 > in-6.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-6.tmp > in-6.out || Exit 1
   ${DIFF} in-6.ok in-6.out || Exit 1
diff --git a/gettext-tools/tests/intl-7 b/gettext-tools/tests/intl-7
index a74df0d7d..c1c5722b9 100755
--- a/gettext-tools/tests/intl-7
+++ b/gettext-tools/tests/intl-7
@@ -108,9 +108,6 @@ if test $LOCALE_FR != none; then
       # they are not supported in the fr_FR.ISO-8859-1 locale.
       ;;
     *)
-      prepare_locale_ in-7/fr_FR in-7/$LOCALE_FR
-      prepare_locale_ in-7/fr in-7/$LOCALE_FR
-      prepare_locale_ "${ldir}"/fr "${ldir}"/$LOCALE_FR
       ../intl-7-prg "${ldir}" in-7 $LOCALE_FR > in-7.tmp || Exit 1
       LC_ALL=C tr -d '\r' < in-7.tmp > in-7.out || Exit 1
       ${DIFF} in-7.ok in-7.out || Exit 1
@@ -118,9 +115,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ in-7/fr_FR in-7/$LOCALE_FR_UTF8
-  prepare_locale_ in-7/fr in-7/$LOCALE_FR_UTF8
-  prepare_locale_ "${ldir}"/fr "${ldir}"/$LOCALE_FR_UTF8
   ../intl-7-prg "${ldir}" in-7 $LOCALE_FR_UTF8 > in-7.tmp || Exit 1
   LC_ALL=C tr -d '\r' < in-7.tmp > in-7.out || Exit 1
   ${DIFF} in-7.ok in-7.out || Exit 1
diff --git a/gettext-tools/tests/intl-thread-1 b/gettext-tools/tests/intl-thread-1
index b702bef1a..0c7bb1b57 100755
--- a/gettext-tools/tests/intl-thread-1
+++ b/gettext-tools/tests/intl-thread-1
@@ -14,7 +14,6 @@ ${MSGFMT} -o in-th-1/fr/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-1.po
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ in-th-1/fr in-th-1/$LOCALE_FR
   ../intl-thread-1-prg $LOCALE_FR > in-th-1.out
   case $? in
     0) ;;
@@ -28,7 +27,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ in-th-1/fr in-th-1/$LOCALE_FR_UTF8
   ../intl-thread-1-prg $LOCALE_FR_UTF8 > in-th-1.out
   case $? in
     0) ;;
diff --git a/gettext-tools/tests/intl-thread-2 b/gettext-tools/tests/intl-thread-2
index 9779c9bbf..03eeba62f 100755
--- a/gettext-tools/tests/intl-thread-2
+++ b/gettext-tools/tests/intl-thread-2
@@ -28,8 +28,6 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 : ${LOCALE_DE_UTF8=de_DE.UTF-8}
 if test $LOCALE_FR_UTF8 != none && test $LOCALE_DE_UTF8 != none; then
-  prepare_locale_ in-th-2/fr in-th-2/$LOCALE_FR_UTF8
-  prepare_locale_ in-th-2/de in-th-2/$LOCALE_DE_UTF8
   ../intl-thread-2-prg $LOCALE_FR_UTF8 $LOCALE_DE_UTF8 > in-th-2.out
   case $? in
     0)
diff --git a/gettext-tools/tests/intl-thread-3 b/gettext-tools/tests/intl-thread-3
index 6e35f3636..7affdc0b3 100755
--- a/gettext-tools/tests/intl-thread-3
+++ b/gettext-tools/tests/intl-thread-3
@@ -18,8 +18,6 @@ ${MSGFMT} -o in-th-3/fr/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-3.po
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none && test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ in-th-3/fr in-th-3/$LOCALE_FR
-  prepare_locale_ in-th-3/fr in-th-3/$LOCALE_FR_UTF8
   ../intl-thread-3-prg $LOCALE_FR $LOCALE_FR_UTF8 > in-th-3.out
   case $? in
     0) ;;
diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash
index 65c6eb9f2..581879d69 100755
--- a/gettext-tools/tests/lang-bash
+++ b/gettext-tools/tests/lang-bash
@@ -142,7 +142,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR bash ./prog.bash 2 > prog.out || Exit 1
   : ${DIFF=diff}
   ${DIFF} prog.nok prog.out > /dev/null && {
@@ -152,7 +151,6 @@ if test $LOCALE_FR != none; then
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 bash ./prog.bash 2 > prog.out || Exit 1
   : ${DIFF=diff}
   ${DIFF} prog.nok prog.out > /dev/null && {
diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index 93293d310..0b4b382ba 100755
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -128,7 +128,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
@@ -141,7 +140,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 52cc1c9cb..f913f6ac1 100755
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -148,7 +148,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
@@ -161,7 +160,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
diff --git a/gettext-tools/tests/lang-c++20 b/gettext-tools/tests/lang-c++20
index ee0693e0c..f04cf2466 100755
--- a/gettext-tools/tests/lang-c++20
+++ b/gettext-tools/tests/lang-c++20
@@ -178,7 +178,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
@@ -191,7 +190,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
diff --git a/gettext-tools/tests/lang-c++26 b/gettext-tools/tests/lang-c++26
index 9fa7df384..f0aabc434 100755
--- a/gettext-tools/tests/lang-c++26
+++ b/gettext-tools/tests/lang-c++26
@@ -155,7 +155,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
@@ -168,7 +167,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp
index 7cd2a6b71..6aa702d3b 100755
--- a/gettext-tools/tests/lang-clisp
+++ b/gettext-tools/tests/lang-clisp
@@ -141,13 +141,11 @@ unset LANGUAGE
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LC_ALL=$LOCALE_FR clisp prog.lisp 2 > prog.tmp || Exit 1
   LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LC_ALL=$LOCALE_FR_UTF8 clisp prog.lisp 2 > prog.tmp || Exit 1
   LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index 52e06b7a1..e60414e5b 100755
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -211,12 +211,10 @@ if test $LOCALE_FR != none; then
   # locale_charset() or nl_langinfo(CODESET) [which is "ISO8859-1" in this case]
   # or "UTF-8" - depending on platform or build configuration. So, allow the
   # expected result in UTF-8 encoding here too.
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
   ${DIFF} prog.oku prog.out >/dev/null || ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-d b/gettext-tools/tests/lang-d
index b3836a8b9..9b5708543 100644
--- a/gettext-tools/tests/lang-d
+++ b/gettext-tools/tests/lang-d
@@ -143,7 +143,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LC_ALL=$LOCALE_FR LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
@@ -156,7 +155,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LC_ALL=$LOCALE_FR_UTF8 LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index 498de3e91..22c020fea 100755
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -148,12 +148,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR gawk -v n=2 -f prog.awk > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk -v n=2 -f prog.awk > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-go b/gettext-tools/tests/lang-go
index b4b576e3c..fa5fd5809 100644
--- a/gettext-tools/tests/lang-go
+++ b/gettext-tools/tests/lang-go
@@ -146,7 +146,6 @@ if test $LOCALE_FR_UTF8 = none; then
   Exit 77
 fi
 
-prepare_locale_ fr $LOCALE_FR_UTF8
 LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ./program 2 > prog.out || Exit 1
 ${DIFF} prog.ok prog.out || Exit 1
 
diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index 714d05eec..aff9f0596 100755
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -137,7 +137,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; Exit 1; }
   grep -v '^;;;' prog.err 1>&2
   ${DIFF} prog.nok prog.out > /dev/null && {
@@ -147,7 +146,6 @@ if test $LOCALE_FR != none; then
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; Exit 1; }
   grep -v '^;;;' prog.err 1>&2
   ${DIFF} prog.nok prog.out > /dev/null && {
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index 65e3e246d..20f814192 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -214,12 +214,10 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 : ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-javascript b/gettext-tools/tests/lang-javascript
index fbd21a4c0..c7e5606e1 100755
--- a/gettext-tools/tests/lang-javascript
+++ b/gettext-tools/tests/lang-javascript
@@ -112,12 +112,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR gjs prog.js > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gjs prog.js > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep
index d7c88a27b..3fdf5f639 100755
--- a/gettext-tools/tests/lang-librep
+++ b/gettext-tools/tests/lang-librep
@@ -115,12 +115,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR rep --no-rc --batch prog.jl > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 rep --no-rc --batch prog.jl > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-lua b/gettext-tools/tests/lang-lua
index c0e35dfb4..28effd5e2 100755
--- a/gettext-tools/tests/lang-lua
+++ b/gettext-tools/tests/lang-lua
@@ -128,12 +128,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR lua -l gettext prog.lua > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 lua -l gettext prog.lua > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-modula2 b/gettext-tools/tests/lang-modula2
index dbdfb9e4a..aca2cfdfc 100644
--- a/gettext-tools/tests/lang-modula2
+++ b/gettext-tools/tests/lang-modula2
@@ -162,7 +162,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LC_ALL=$LOCALE_FR LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
@@ -175,7 +174,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LC_ALL=$LOCALE_FR_UTF8 LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index cc512495e..05f8c4d4f 100755
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -143,7 +143,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
@@ -156,7 +155,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index 8902a7e8e..bc6f2464b 100755
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -99,14 +99,12 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > pascalprog.out || Exit 1
   : ${DIFF=diff}
   ${DIFF} pascalprog.ok pascalprog.out || Exit 1
 fi
 if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR_UTF8 != none; then
-    prepare_locale_ fr $LOCALE_FR_UTF8
     LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > pascalprog.out || Exit 1
     : ${DIFF=diff}
     ${DIFF} pascalprog.oku pascalprog.out || Exit 1
diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1
index 523dcb66f..896ef6814 100755
--- a/gettext-tools/tests/lang-perl-1
+++ b/gettext-tools/tests/lang-perl-1
@@ -105,12 +105,10 @@ case "$host_os" in
   darwin* | netbsd*) LOCALE_FR=none ;;
 esac
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2
index c74a0b444..6d7ea3f86 100755
--- a/gettext-tools/tests/lang-perl-2
+++ b/gettext-tools/tests/lang-perl-2
@@ -105,12 +105,10 @@ case "$host_os" in
   darwin* | netbsd*) LOCALE_FR=none ;;
 esac
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index 4ba8f6f51..2c7447e4e 100755
--- a/gettext-tools/tests/lang-php
+++ b/gettext-tools/tests/lang-php
@@ -113,12 +113,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR php -q prog.php > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 php -q prog.php > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1
index ad72bc856..50e39db0f 100755
--- a/gettext-tools/tests/lang-python-1
+++ b/gettext-tools/tests/lang-python-1
@@ -88,13 +88,11 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 PYTHONIOENCODING=UTF-8 $PYTHON prog1.py > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test -z "$ISO8859_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR != none; then
-    prepare_locale_ fr $LOCALE_FR
     LANGUAGE= LC_ALL=$LOCALE_FR PYTHONIOENCODING=ISO-8859-1 $PYTHON prog1.py > prog.out || Exit 1
     ${DIFF} prog.ok prog.out || Exit 1
   fi
diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2
index d33f5fe5c..6449f29df 100755
--- a/gettext-tools/tests/lang-python-2
+++ b/gettext-tools/tests/lang-python-2
@@ -109,13 +109,11 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 PYTHONIOENCODING=UTF-8 $PYTHON prog2.py 2 > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test -z "$ISO8859_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR != none; then
-    prepare_locale_ fr $LOCALE_FR
     LANGUAGE= LC_ALL=$LOCALE_FR PYTHONIOENCODING=ISO-8859-1 $PYTHON prog2.py 2 > prog.out || Exit 1
     ${DIFF} prog.ok prog.out || Exit 1
   fi
diff --git a/gettext-tools/tests/lang-ruby b/gettext-tools/tests/lang-ruby
index 6095c0bc2..161f300df 100644
--- a/gettext-tools/tests/lang-ruby
+++ b/gettext-tools/tests/lang-ruby
@@ -108,12 +108,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR ruby prog.rb > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ruby prog.rb > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-rust b/gettext-tools/tests/lang-rust
index f2e5ff55b..840759d94 100755
--- a/gettext-tools/tests/lang-rust
+++ b/gettext-tools/tests/lang-rust
@@ -148,12 +148,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR target/debug/gettext-lang-rust 2 > prog.out1 || Exit 1
   ${DIFF} prog.ok prog.out1 || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 target/debug/gettext-lang-rust 2 > prog.out2 || Exit 1
   ${DIFF} prog.ok prog.out2 || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh
index afc297323..ea16458f9 100755
--- a/gettext-tools/tests/lang-sh
+++ b/gettext-tools/tests/lang-sh
@@ -172,12 +172,10 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR sh ./prog.sh 2 > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 sh ./prog.sh 2 > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index 8c566aacc..4b8286526 100755
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -117,7 +117,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR gst -Q prog.st > prog.out || Exit 1
   ${DIFF} prog.ok prog.out > /dev/null ||
     ${DIFF} prog.ok2 prog.out > /dev/null ||
@@ -125,7 +124,6 @@ if test $LOCALE_FR != none; then
         { ${DIFF} prog.ok prog.out; Exit 1; }
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gst -Q prog.st > prog.out || Exit 1
   ${DIFF} prog.oku prog.out > /dev/null ||
     ${DIFF} prog.oku2 prog.out > /dev/null ||
diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl
index 1de8d5c12..87cd229c1 100755
--- a/gettext-tools/tests/lang-tcl
+++ b/gettext-tools/tests/lang-tcl
@@ -105,13 +105,11 @@ case "$host_os" in
     ;;
 esac
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LANG=$LOCALE_FR tclsh program.tcl > prog.tmp || Exit 1
   LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LANG=$LOCALE_FR_UTF8 tclsh program.tcl > prog.tmp || Exit 1
   LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala
index 8e457320f..f43f6317b 100755
--- a/gettext-tools/tests/lang-vala
+++ b/gettext-tools/tests/lang-vala
@@ -98,7 +98,6 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR ./prog > prog.out
   case $? in
     0) ${DIFF} prog.ok prog.out || Exit 1;;
@@ -107,7 +106,6 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ./prog > prog.out
   case $? in
     0) ${DIFF} prog.oku prog.out || Exit 1;;
diff --git a/gettext-tools/tests/msgfmt-20 b/gettext-tools/tests/msgfmt-20
index bbe12e0a8..24ebc09b3 100755
--- a/gettext-tools/tests/msgfmt-20
+++ b/gettext-tools/tests/msgfmt-20
@@ -75,14 +75,12 @@ EOF
 : ${GETTEXT=gettext}
 : ${DIFF=diff}
 if test $LOCALE_FR != none; then
-  prepare_locale_ fr $LOCALE_FR
   LC_ALL=$LOCALE_FR LANGUAGE= TEXTDOMAINDIR=. TEXTDOMAIN=mf-20 \
   ${GETTEXT} -s 'Sunshine heats.' > mf-20.tmp
   LC_ALL=C tr -d '\r' < mf-20.tmp > mf-20.out
   ${DIFF} mf-20.ok mf-20.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  prepare_locale_ fr $LOCALE_FR_UTF8
   LC_ALL=$LOCALE_FR_UTF8 LANGUAGE= TEXTDOMAINDIR=. TEXTDOMAIN=mf-20 \
   ${GETTEXT} -s 'Sunshine heats.' > mf-20.tmp
   LC_ALL=C tr -d '\r' < mf-20.tmp > mf-20.out
diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1
index 02d5fce46..0021ec1d8 100755
--- a/gettext-tools/tests/plural-1
+++ b/gettext-tools/tests/plural-1
@@ -78,11 +78,9 @@ else
   : ${LOCALE_FR=fr_FR}
   : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
   if test $LOCALE_FR != none; then
-    prepare_locale_ plural-1-dir/fr plural-1-dir/$LOCALE_FR
     func_do_test $LOCALE_FR
   fi
   if test $LOCALE_FR_UTF8 != none; then
-    prepare_locale_ plural-1-dir/fr plural-1-dir/$LOCALE_FR_UTF8
     func_do_test $LOCALE_FR_UTF8
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then