--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,91 @@
+2010-01-24  Bruno Haible  <bruno@clisp.org>
+
+	Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default.
+	* gnulib-tool (func_emit_tests_Makefile_am): Add EXEEXT and srcdir
+	assignments to the initial TESTS_ENVIRONMENT.
+	* doc/gnulib.texi (Unit test modules): Document it.
+	* modules/acl-tests (Makefile.am): Drop EXEEXT assignment from
+	TESTS_ENVIRONMENT.
+	* modules/btowc-tests (Makefile.am): Likewise.
+	* modules/c-stack-tests (Makefile.am): Likewise.
+	* modules/c-strcase-tests (Makefile.am): Likewise.
+	* modules/copy-file-tests (Makefile.am): Likewise.
+	* modules/mbmemcasecmp-tests (Makefile.am): Likewise.
+	* modules/mbmemcasecoll-tests (Makefile.am): Likewise.
+	* modules/mbrtowc-tests (Makefile.am): Likewise.
+	* modules/mbscasecmp-tests (Makefile.am): Likewise.
+	* modules/mbscasestr-tests (Makefile.am): Likewise.
+	* modules/mbschr-tests (Makefile.am): Likewise.
+	* modules/mbscspn-tests (Makefile.am): Likewise.
+	* modules/mbsinit-tests (Makefile.am): Likewise.
+	* modules/mbsncasecmp-tests (Makefile.am): Likewise.
+	* modules/mbsnrtowcs-tests (Makefile.am): Likewise.
+	* modules/mbspbrk-tests (Makefile.am): Likewise.
+	* modules/mbspcasecmp-tests (Makefile.am): Likewise.
+	* modules/mbsrchr-tests (Makefile.am): Likewise.
+	* modules/mbsrtowcs-tests (Makefile.am): Likewise.
+	* modules/mbsspn-tests (Makefile.am): Likewise.
+	* modules/mbsstr-tests (Makefile.am): Likewise.
+	* modules/nl_langinfo-tests (Makefile.am): Likewise.
+	* modules/unicase/locale-language-tests (Makefile.am): Likewise.
+	* modules/unistdio/u16-vasnprintf-tests (Makefile.am): Likewise.
+	* modules/unistdio/u32-vasnprintf-tests (Makefile.am): Likewise.
+	* modules/unistdio/u8-vasnprintf-tests (Makefile.am): Likewise.
+	* modules/unistdio/ulc-vasnprintf-tests (Makefile.am): Likewise.
+	* modules/uniwbrk/ulc-wordbreaks-tests (Makefile.am): Likewise.
+	* modules/vasnprintf-posix-tests (Makefile.am): Likewise.
+	* modules/wcrtomb-tests (Makefile.am): Likewise.
+	* modules/wcsnrtombs-tests (Makefile.am): Likewise.
+	* modules/wcsrtombs-tests (Makefile.am): Likewise.
+	* modules/quotearg-tests (Makefile.am): Drop EXEEXT and srcdir
+	assignments from TESTS_ENVIRONMENT.
+	* modules/argp-tests (Makefile.am): Drop TESTS_ENVIRONMENT
+	augmentation.
+	* modules/argp-version-etc-tests (Makefile.am): Likewise.
+	* modules/atexit-tests (Makefile.am): Likewise.
+	* modules/binary-io-tests (Makefile.am): Likewise.
+	* modules/closein-tests (Makefile.am): Likewise.
+	* modules/dprintf-posix-tests (Makefile.am): Likewise.
+	* modules/exclude-tests (Makefile.am): Likewise.
+	* modules/fflush-tests (Makefile.am): Likewise.
+	* modules/fpending-tests (Makefile.am): Likewise.
+	* modules/fprintf-posix-tests (Makefile.am): Likewise.
+	* modules/freadahead-tests (Makefile.am): Likewise.
+	* modules/freadptr-tests (Makefile.am): Likewise.
+	* modules/freadseek-tests (Makefile.am): Likewise.
+	* modules/fseek-tests (Makefile.am): Likewise.
+	* modules/fseeko-tests (Makefile.am): Likewise.
+	* modules/ftell-tests (Makefile.am): Likewise.
+	* modules/ftello-tests (Makefile.am): Likewise.
+	* modules/idpriv-drop-tests (Makefile.am): Likewise.
+	* modules/idpriv-droptemp-tests (Makefile.am): Likewise.
+	* modules/lseek-tests (Makefile.am): Likewise.
+	* modules/parse-duration-tests (Makefile.am): Likewise.
+	* modules/perror-tests (Makefile.am): Likewise.
+	* modules/pipe-filter-gi-tests (Makefile.am): Likewise.
+	* modules/pipe-filter-ii-tests (Makefile.am): Likewise.
+	* modules/pipe-tests (Makefile.am): Likewise.
+	* modules/pread-tests (Makefile.am): Likewise.
+	* modules/printf-posix-tests (Makefile.am): Likewise.
+	* modules/select-tests (Makefile.am): Likewise.
+	* modules/sigpipe-tests (Makefile.am): Likewise.
+	* modules/tsearch-tests (Makefile.am): Likewise.
+	* modules/unicase/ulc-casecmp-tests (Makefile.am): Likewise.
+	* modules/unicase/ulc-casecoll-tests (Makefile.am): Likewise.
+	* modules/uniname/uniname-tests (Makefile.am): Likewise.
+	* modules/uniwidth/width-tests (Makefile.am): Likewise.
+	* modules/vdprintf-posix-tests (Makefile.am): Likewise.
+	* modules/version-etc-tests (Makefile.am): Likewise.
+	* modules/vfprintf-posix-tests (Makefile.am): Likewise.
+	* modules/vprintf-posix-tests (Makefile.am): Likewise.
+	* modules/xalloc-die-tests (Makefile.am): Likewise.
+	* modules/xprintf-posix-tests (Makefile.am): Likewise.
+	* modules/xstrtoimax-tests (Makefile.am): Likewise.
+	* modules/xstrtol-tests (Makefile.am): Likewise.
+	* modules/xstrtoumax-tests (Makefile.am): Likewise.
+	* modules/yesno-tests (Makefile.am): Likewise.
+	Suggested by Jim Meyering.
+
 2010-01-24  Bruno Haible  <bruno@clisp.org>
 
 	More documentation.

--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -559,7 +559,10 @@
 
 Here, the @code{TESTS_ENVIRONMENT} variable can be used to pass values
 determined by @code{configure} or by the @code{Makefile} to the shell
-script, as environment variables.
+script, as environment variables.  The values of @code{EXEEXT} and of
+@code{srcdir}, from Autoconf and Automake, are already provided as
+environment variables, through an initial value of @code{TESTS_ENVIRONMENT}
+that @code{gnulib-tool} puts in place.
 
 Regardless of the specific form of the unit test, the following guidelines
 should be respected:

--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2373,6 +2373,11 @@
     echo "AM_LIBTOOLFLAGS = --preserve-dup-deps"
     echo
   fi
+  # Many test scripts use ${EXEEXT} or ${srcdir}.
+  # EXEEXT is defined by AC_PROG_CC through autoconf.
+  # srcdir is defined by autoconf and automake.
+  echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'"
+  echo
   cat "$tmp"/allsnippets \
     | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
   echo "# Clean up after Solaris cc."

--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -19,7 +19,7 @@
 
 Makefile.am:
 TESTS += test-file-has-acl.sh test-set-mode-acl.sh test-copy-acl.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' USE_ACL=$(USE_ACL)
+TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-file-has-acl test-set-mode-acl test-copy-acl test-sameacls
 test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL)
 test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@

--- a/modules/argp-tests
+++ b/modules/argp-tests
@@ -7,6 +7,5 @@
 
 Makefile.am:
 TESTS += test-argp test-argp-2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-argp
 test_argp_LDADD = $(LDADD) @LIBINTL@

--- a/modules/argp-version-etc-tests
+++ b/modules/argp-version-etc-tests
@@ -9,6 +9,5 @@
 
 Makefile.am:
 TESTS += test-argp-version-etc test-argp-version-etc-1.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-argp-version-etc
 test_argp_version_etc_LDADD = $(LDADD) @LIBINTL@

--- a/modules/atexit-tests
+++ b/modules/atexit-tests
@@ -10,5 +10,4 @@
 
 Makefile.am:
 TESTS += test-atexit.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-atexit

--- a/modules/binary-io-tests
+++ b/modules/binary-io-tests
@@ -9,6 +9,5 @@
 
 Makefile.am:
 TESTS += test-binary-io.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-binary-io
 

--- a/modules/btowc-tests
+++ b/modules/btowc-tests
@@ -15,6 +15,6 @@
 
 Makefile.am:
 TESTS += test-btowc1.sh test-btowc2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-btowc
 

--- a/modules/c-stack-tests
+++ b/modules/c-stack-tests
@@ -11,7 +11,7 @@
 
 Makefile.am:
 TESTS += test-c-stack.sh test-c-stack2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LIBSIGSEGV='@LIBSIGSEGV@'
+TESTS_ENVIRONMENT += LIBSIGSEGV='@LIBSIGSEGV@'
 check_PROGRAMS += test-c-stack
 test_c_stack_LDADD = $(LDADD) $(LIBCSTACK) @LIBINTL@
 MOSTLYCLEANFILES += t-c-stack.tmp t-c-stack2.tmp

--- a/modules/c-strcase-tests
+++ b/modules/c-strcase-tests
@@ -15,5 +15,5 @@
 
 Makefile.am:
 TESTS += test-c-strcase.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-c-strcasecmp test-c-strncasecmp

--- a/modules/closein-tests
+++ b/modules/closein-tests
@@ -9,6 +9,5 @@
 
 Makefile.am:
 TESTS += test-closein.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-closein
 test_closein_LDADD = $(LDADD) @LIBINTL@

--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -14,6 +14,6 @@
 
 Makefile.am:
 TESTS += test-copy-file.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' USE_ACL=$(USE_ACL)
+TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-copy-file
 test_copy_file_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@

--- a/modules/dprintf-posix-tests
+++ b/modules/dprintf-posix-tests
@@ -15,5 +15,4 @@
 
 Makefile.am:
 TESTS += test-dprintf-posix.sh test-dprintf-posix2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-dprintf-posix test-dprintf-posix2

--- a/modules/exclude-tests
+++ b/modules/exclude-tests
@@ -23,6 +23,5 @@
  test-exclude6.sh\
  test-exclude7.sh
 
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-exclude
 test_exclude_LDADD = $(LDADD) @LIBINTL@

--- a/modules/fflush-tests
+++ b/modules/fflush-tests
@@ -13,6 +13,5 @@
 
 Makefile.am:
 TESTS += test-fflush test-fflush2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-fflush test-fflush2
 MOSTLYCLEANFILES += test-fflush.txt

--- a/modules/fpending-tests
+++ b/modules/fpending-tests
@@ -9,6 +9,5 @@
 
 Makefile.am:
 TESTS += test-fpending.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-fpending
 MOSTLYCLEANFILES += test-fpending.t

--- a/modules/fprintf-posix-tests
+++ b/modules/fprintf-posix-tests
@@ -18,5 +18,4 @@
 
 Makefile.am:
 TESTS += test-fprintf-posix.sh test-fprintf-posix2.sh test-fprintf-posix3.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-fprintf-posix test-fprintf-posix2 test-fprintf-posix3

--- a/modules/freadahead-tests
+++ b/modules/freadahead-tests
@@ -11,5 +11,4 @@
 
 Makefile.am:
 TESTS += test-freadahead.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-freadahead

--- a/modules/freadptr-tests
+++ b/modules/freadptr-tests
@@ -13,5 +13,4 @@
 
 Makefile.am:
 TESTS += test-freadptr.sh test-freadptr2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-freadptr test-freadptr2

--- a/modules/freadseek-tests
+++ b/modules/freadseek-tests
@@ -10,5 +10,4 @@
 
 Makefile.am:
 TESTS += test-freadseek.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-freadseek

--- a/modules/fseek-tests
+++ b/modules/fseek-tests
@@ -13,5 +13,4 @@
 
 Makefile.am:
 TESTS += test-fseek.sh test-fseek2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-fseek

--- a/modules/fseeko-tests
+++ b/modules/fseeko-tests
@@ -13,5 +13,4 @@
 
 Makefile.am:
 TESTS += test-fseeko.sh test-fseeko2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-fseeko

--- a/modules/ftell-tests
+++ b/modules/ftell-tests
@@ -14,5 +14,4 @@
 
 Makefile.am:
 TESTS += test-ftell.sh test-ftell2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-ftell

--- a/modules/ftello-tests
+++ b/modules/ftello-tests
@@ -14,5 +14,4 @@
 
 Makefile.am:
 TESTS += test-ftello.sh test-ftello2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-ftello

--- a/modules/idpriv-drop-tests
+++ b/modules/idpriv-drop-tests
@@ -16,5 +16,4 @@
 
 Makefile.am:
 TESTS += test-idpriv-drop.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-idpriv-drop

--- a/modules/idpriv-droptemp-tests
+++ b/modules/idpriv-droptemp-tests
@@ -16,5 +16,4 @@
 
 Makefile.am:
 TESTS += test-idpriv-droptemp.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-idpriv-droptemp

--- a/modules/lseek-tests
+++ b/modules/lseek-tests
@@ -10,5 +10,4 @@
 
 Makefile.am:
 TESTS += test-lseek.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-lseek

--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -20,7 +20,6 @@
 Makefile.am:
 TESTS += test-mbmemcasecmp1.sh test-mbmemcasecmp2.sh test-mbmemcasecmp3.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'

--- a/modules/mbmemcasecoll-tests
+++ b/modules/mbmemcasecoll-tests
@@ -20,7 +20,6 @@
 Makefile.am:
 TESTS += test-mbmemcasecoll1.sh test-mbmemcasecoll2.sh test-mbmemcasecoll3.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'

--- a/modules/mbrtowc-tests
+++ b/modules/mbrtowc-tests
@@ -24,7 +24,6 @@
 Makefile.am:
 TESTS += test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_JA='@LOCALE_JA@' \

--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbscasecmp.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbscasecmp
 

--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -21,6 +21,6 @@
 
 Makefile.am:
 TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4
 

--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbschr.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbschr
 

--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbscspn.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbscspn
 

--- a/modules/mbsinit-tests
+++ b/modules/mbsinit-tests
@@ -14,6 +14,6 @@
 
 Makefile.am:
 TESTS += test-mbsinit.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbsinit
 

--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbsncasecmp.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbsncasecmp
 

--- a/modules/mbsnrtowcs-tests
+++ b/modules/mbsnrtowcs-tests
@@ -25,7 +25,6 @@
 Makefile.am:
 TESTS += test-mbsnrtowcs1.sh test-mbsnrtowcs2.sh test-mbsnrtowcs3.sh test-mbsnrtowcs4.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_JA='@LOCALE_JA@' \

--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbspbrk.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbspbrk
 

--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbspcasecmp.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbspcasecmp
 

--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbsrchr.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsrchr
 

--- a/modules/mbsrtowcs-tests
+++ b/modules/mbsrtowcs-tests
@@ -25,7 +25,6 @@
 Makefile.am:
 TESTS += test-mbsrtowcs1.sh test-mbsrtowcs2.sh test-mbsrtowcs3.sh test-mbsrtowcs4.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_JA='@LOCALE_JA@' \

--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -12,6 +12,6 @@
 
 Makefile.am:
 TESTS += test-mbsspn.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbsspn
 

--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -17,6 +17,6 @@
 
 Makefile.am:
 TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
 

--- a/modules/nl_langinfo-tests
+++ b/modules/nl_langinfo-tests
@@ -14,5 +14,5 @@
 
 Makefile.am:
 TESTS += test-nl_langinfo.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-nl_langinfo

--- a/modules/parse-duration-tests
+++ b/modules/parse-duration-tests
@@ -10,6 +10,5 @@
 
 Makefile.am:
 TESTS += test-parse-duration.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-parse-duration
 test_parse_duration_LDADD = $(LDADD) @LIBINTL@

--- a/modules/perror-tests
+++ b/modules/perror-tests
@@ -9,5 +9,4 @@
 
 Makefile.am:
 TESTS += test-perror.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-perror

--- a/modules/pipe-filter-gi-tests
+++ b/modules/pipe-filter-gi-tests
@@ -19,7 +19,6 @@
 
 Makefile.am:
 TESTS += test-pipe-filter-gi1.sh test-pipe-filter-gi2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-pipe-filter-gi1 test-pipe-filter-gi2-main test-pipe-filter-gi2-child
 test_pipe_filter_gi1_LDADD = $(LDADD) @LIBINTL@
 test_pipe_filter_gi2_main_LDADD = $(LDADD) @LIBINTL@

--- a/modules/pipe-filter-ii-tests
+++ b/modules/pipe-filter-ii-tests
@@ -18,7 +18,6 @@
 
 Makefile.am:
 TESTS += test-pipe-filter-ii1.sh test-pipe-filter-ii2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-pipe-filter-ii1 test-pipe-filter-ii2-main test-pipe-filter-ii2-child
 test_pipe_filter_ii1_LDADD = $(LDADD) @LIBINTL@
 test_pipe_filter_ii2_main_LDADD = $(LDADD) @LIBINTL@

--- a/modules/pipe-tests
+++ b/modules/pipe-tests
@@ -10,6 +10,5 @@
 
 Makefile.am:
 TESTS += test-pipe.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-pipe
 test_pipe_LDADD = $(LDADD) @LIBINTL@

--- a/modules/pread-tests
+++ b/modules/pread-tests
@@ -12,5 +12,3 @@
 Makefile.am:
 TESTS += test-pread.sh
 check_PROGRAMS += test-pread
-TESTS_ENVIRONMENT +=	\
-  srcdir='$(srcdir)'

--- a/modules/printf-posix-tests
+++ b/modules/printf-posix-tests
@@ -16,5 +16,4 @@
 
 Makefile.am:
 TESTS += test-printf-posix.sh test-printf-posix2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-printf-posix test-printf-posix2

--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -20,6 +20,6 @@
 
 Makefile.am:
 TESTS += test-quotearg.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-quotearg
 test_quotearg_LDADD = $(LDADD) @LIBINTL@

--- a/modules/select-tests
+++ b/modules/select-tests
@@ -31,7 +31,6 @@
 Makefile.am:
 TESTS += test-select test-select-in.sh test-select-out.sh
 # test-select-stdin has to be run by hand.
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-select test-select-fd test-select-stdin
 test_select_LDADD = $(LDADD) @LIBSOCKET@ $(INET_PTON_LIB)
 test_select_fd_LDADD = $(LDADD) @LIBSOCKET@

--- a/modules/sigpipe-tests
+++ b/modules/sigpipe-tests
@@ -9,6 +9,5 @@
 
 Makefile.am:
 TESTS += test-sigpipe.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-sigpipe
 

--- a/modules/tsearch-tests
+++ b/modules/tsearch-tests
@@ -20,6 +20,5 @@
 
 Makefile.am:
 TESTS += test-tsearch.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-tsearch
 test_tsearch_LDADD = $(LDADD) @TEST_TSEARCH_LIBM@

--- a/modules/unicase/locale-language-tests
+++ b/modules/unicase/locale-language-tests
@@ -19,7 +19,7 @@
 
 Makefile.am:
 TESTS += unicase/test-locale-language.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-locale-language
 test_locale_language_SOURCES = unicase/test-locale-language.c
 test_locale_language_LDADD = $(LDADD) @INTL_MACOSX_LIBS@

--- a/modules/unicase/ulc-casecmp-tests
+++ b/modules/unicase/ulc-casecmp-tests
@@ -17,7 +17,6 @@
 Makefile.am:
 TESTS += unicase/test-ulc-casecmp1.sh unicase/test-ulc-casecmp2.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-ulc-casecmp

--- a/modules/unicase/ulc-casecoll-tests
+++ b/modules/unicase/ulc-casecoll-tests
@@ -17,7 +17,6 @@
 Makefile.am:
 TESTS += unicase/test-ulc-casecoll1.sh unicase/test-ulc-casecoll2.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-ulc-casecoll

--- a/modules/uniname/uniname-tests
+++ b/modules/uniname/uniname-tests
@@ -11,7 +11,6 @@
 
 Makefile.am:
 TESTS += uniname/test-uninames.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-uninames
 test_uninames_SOURCES = uniname/test-uninames.c
 test_uninames_LDADD = $(LDADD) @LIBINTL@

--- a/modules/unistdio/u16-vasnprintf-tests
+++ b/modules/unistdio/u16-vasnprintf-tests
@@ -22,7 +22,7 @@
 
 Makefile.am:
 TESTS += test-u16-vasnprintf1 unistdio/test-u16-vasnprintf2.sh unistdio/test-u16-vasnprintf3.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-u16-vasnprintf1 test-u16-vasnprintf2 test-u16-vasnprintf3
 test_u16_vasnprintf1_SOURCES = unistdio/test-u16-vasnprintf1.c
 test_u16_vasnprintf1_LDADD = $(LDADD) @LIBICONV@

--- a/modules/unistdio/u32-vasnprintf-tests
+++ b/modules/unistdio/u32-vasnprintf-tests
@@ -22,7 +22,7 @@
 
 Makefile.am:
 TESTS += test-u32-vasnprintf1 unistdio/test-u32-vasnprintf2.sh unistdio/test-u32-vasnprintf3.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-u32-vasnprintf1 test-u32-vasnprintf2 test-u32-vasnprintf3
 test_u32_vasnprintf1_SOURCES = unistdio/test-u32-vasnprintf1.c
 test_u32_vasnprintf1_LDADD = $(LDADD) @LIBICONV@

--- a/modules/unistdio/u8-vasnprintf-tests
+++ b/modules/unistdio/u8-vasnprintf-tests
@@ -22,7 +22,7 @@
 
 Makefile.am:
 TESTS += test-u8-vasnprintf1 unistdio/test-u8-vasnprintf2.sh unistdio/test-u8-vasnprintf3.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-u8-vasnprintf1 test-u8-vasnprintf2 test-u8-vasnprintf3
 test_u8_vasnprintf1_SOURCES = unistdio/test-u8-vasnprintf1.c
 test_u8_vasnprintf1_LDADD = $(LDADD) @LIBICONV@

--- a/modules/unistdio/ulc-vasnprintf-tests
+++ b/modules/unistdio/ulc-vasnprintf-tests
@@ -18,7 +18,7 @@
 
 Makefile.am:
 TESTS += test-ulc-vasnprintf1 unistdio/test-ulc-vasnprintf2.sh unistdio/test-ulc-vasnprintf3.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-ulc-vasnprintf1 test-ulc-vasnprintf2 test-ulc-vasnprintf3
 test_ulc_vasnprintf1_SOURCES = unistdio/test-ulc-vasnprintf1.c
 test_ulc_vasnprintf1_LDADD = $(LDADD) @LIBICONV@

--- a/modules/uniwbrk/ulc-wordbreaks-tests
+++ b/modules/uniwbrk/ulc-wordbreaks-tests
@@ -12,7 +12,7 @@
 
 Makefile.am:
 TESTS += uniwbrk/test-ulc-wordbreaks.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
 check_PROGRAMS += test-ulc-wordbreaks
 test_ulc_wordbreaks_SOURCES = uniwbrk/test-ulc-wordbreaks.c
 test_ulc_wordbreaks_LDADD = $(LDADD) @LIBICONV@

--- a/modules/uniwidth/width-tests
+++ b/modules/uniwidth/width-tests
@@ -10,7 +10,6 @@
 
 Makefile.am:
 TESTS += test-uc_width uniwidth/test-uc_width2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-uc_width test-uc_width2
 test_uc_width_SOURCES = uniwidth/test-uc_width.c
 test_uc_width2_SOURCES = uniwidth/test-uc_width2.c

--- a/modules/vasnprintf-posix-tests
+++ b/modules/vasnprintf-posix-tests
@@ -17,5 +17,5 @@
 
 Makefile.am:
 TESTS += test-vasnprintf-posix test-vasnprintf-posix2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-vasnprintf-posix test-vasnprintf-posix2

--- a/modules/vdprintf-posix-tests
+++ b/modules/vdprintf-posix-tests
@@ -13,5 +13,4 @@
 
 Makefile.am:
 TESTS += test-vdprintf-posix.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-vdprintf-posix

--- a/modules/version-etc-tests
+++ b/modules/version-etc-tests
@@ -8,6 +8,5 @@
 
 Makefile.am:
 TESTS += test-version-etc.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-version-etc
 test_version_etc_LDADD = $(LDADD) @LIBINTL@

--- a/modules/vfprintf-posix-tests
+++ b/modules/vfprintf-posix-tests
@@ -13,5 +13,4 @@
 
 Makefile.am:
 TESTS += test-vfprintf-posix.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-vfprintf-posix

--- a/modules/vprintf-posix-tests
+++ b/modules/vprintf-posix-tests
@@ -13,5 +13,4 @@
 
 Makefile.am:
 TESTS += test-vprintf-posix.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-vprintf-posix

--- a/modules/wcrtomb-tests
+++ b/modules/wcrtomb-tests
@@ -20,7 +20,6 @@
 Makefile.am:
 TESTS += test-wcrtomb.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_JA='@LOCALE_JA@' \

--- a/modules/wcsnrtombs-tests
+++ b/modules/wcsnrtombs-tests
@@ -22,7 +22,6 @@
 Makefile.am:
 TESTS += test-wcsnrtombs1.sh test-wcsnrtombs2.sh test-wcsnrtombs3.sh test-wcsnrtombs4.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_JA='@LOCALE_JA@' \

--- a/modules/wcsrtombs-tests
+++ b/modules/wcsrtombs-tests
@@ -22,7 +22,6 @@
 Makefile.am:
 TESTS += test-wcsrtombs1.sh test-wcsrtombs2.sh test-wcsrtombs3.sh test-wcsrtombs4.sh
 TESTS_ENVIRONMENT += \
-  EXEEXT='@EXEEXT@' \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_JA='@LOCALE_JA@' \

--- a/modules/xalloc-die-tests
+++ b/modules/xalloc-die-tests
@@ -8,6 +8,5 @@
 
 Makefile.am:
 TESTS += test-xalloc-die.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-xalloc-die
 test_xalloc_die_LDADD = $(LDADD) @LIBINTL@

--- a/modules/xprintf-posix-tests
+++ b/modules/xprintf-posix-tests
@@ -15,7 +15,6 @@
 
 Makefile.am:
 TESTS += test-xprintf-posix.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 check_PROGRAMS += test-xfprintf-posix test-xprintf-posix
 test_xfprintf_posix_LDADD = $(LDADD) @LIBINTL@
 test_xprintf_posix_LDADD = $(LDADD) @LIBINTL@

--- a/modules/xstrtoimax-tests
+++ b/modules/xstrtoimax-tests
@@ -8,6 +8,5 @@
 
 Makefile.am:
 TESTS += test-xstrtoimax.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-xstrtoimax
 test_xstrtoimax_LDADD = $(LDADD) @LIBINTL@

--- a/modules/xstrtol-tests
+++ b/modules/xstrtol-tests
@@ -9,7 +9,6 @@
 
 Makefile.am:
 TESTS += test-xstrtol.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-xstrtol test-xstrtoul
 test_xstrtol_LDADD = $(LDADD) @LIBINTL@
 test_xstrtoul_LDADD = $(LDADD) @LIBINTL@

--- a/modules/xstrtoumax-tests
+++ b/modules/xstrtoumax-tests
@@ -8,6 +8,5 @@
 
 Makefile.am:
 TESTS += test-xstrtoumax.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-xstrtoumax
 test_xstrtoumax_LDADD = $(LDADD) @LIBINTL@

--- a/modules/yesno-tests
+++ b/modules/yesno-tests
@@ -10,6 +10,5 @@
 
 Makefile.am:
 TESTS += test-yesno.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-yesno
 test_yesno_LDADD = $(LDADD) @LIBINTL@