summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog88
-rw-r--r--doc/gnulib.texi5
-rwxr-xr-xgnulib-tool5
-rw-r--r--modules/acl-tests2
-rw-r--r--modules/argp-tests1
-rw-r--r--modules/argp-version-etc-tests1
-rw-r--r--modules/atexit-tests1
-rw-r--r--modules/binary-io-tests1
-rw-r--r--modules/btowc-tests2
-rw-r--r--modules/c-stack-tests2
-rw-r--r--modules/c-strcase-tests2
-rw-r--r--modules/closein-tests1
-rw-r--r--modules/copy-file-tests2
-rw-r--r--modules/dprintf-posix-tests1
-rw-r--r--modules/exclude-tests1
-rw-r--r--modules/fflush-tests1
-rw-r--r--modules/fpending-tests1
-rw-r--r--modules/fprintf-posix-tests1
-rw-r--r--modules/freadahead-tests1
-rw-r--r--modules/freadptr-tests1
-rw-r--r--modules/freadseek-tests1
-rw-r--r--modules/fseek-tests1
-rw-r--r--modules/fseeko-tests1
-rw-r--r--modules/ftell-tests1
-rw-r--r--modules/ftello-tests1
-rw-r--r--modules/idpriv-drop-tests1
-rw-r--r--modules/idpriv-droptemp-tests1
-rw-r--r--modules/lseek-tests1
-rw-r--r--modules/mbmemcasecmp-tests1
-rw-r--r--modules/mbmemcasecoll-tests1
-rw-r--r--modules/mbrtowc-tests1
-rw-r--r--modules/mbscasecmp-tests2
-rw-r--r--modules/mbscasestr-tests2
-rw-r--r--modules/mbschr-tests2
-rw-r--r--modules/mbscspn-tests2
-rw-r--r--modules/mbsinit-tests2
-rw-r--r--modules/mbsncasecmp-tests2
-rw-r--r--modules/mbsnrtowcs-tests1
-rw-r--r--modules/mbspbrk-tests2
-rw-r--r--modules/mbspcasecmp-tests2
-rw-r--r--modules/mbsrchr-tests2
-rw-r--r--modules/mbsrtowcs-tests1
-rw-r--r--modules/mbsspn-tests2
-rw-r--r--modules/mbsstr-tests2
-rw-r--r--modules/nl_langinfo-tests2
-rw-r--r--modules/parse-duration-tests1
-rw-r--r--modules/perror-tests1
-rw-r--r--modules/pipe-filter-gi-tests1
-rw-r--r--modules/pipe-filter-ii-tests1
-rw-r--r--modules/pipe-tests1
-rw-r--r--modules/pread-tests2
-rw-r--r--modules/printf-posix-tests1
-rw-r--r--modules/quotearg-tests2
-rw-r--r--modules/select-tests1
-rw-r--r--modules/sigpipe-tests1
-rw-r--r--modules/tsearch-tests1
-rw-r--r--modules/unicase/locale-language-tests2
-rw-r--r--modules/unicase/ulc-casecmp-tests1
-rw-r--r--modules/unicase/ulc-casecoll-tests1
-rw-r--r--modules/uniname/uniname-tests1
-rw-r--r--modules/unistdio/u16-vasnprintf-tests2
-rw-r--r--modules/unistdio/u32-vasnprintf-tests2
-rw-r--r--modules/unistdio/u8-vasnprintf-tests2
-rw-r--r--modules/unistdio/ulc-vasnprintf-tests2
-rw-r--r--modules/uniwbrk/ulc-wordbreaks-tests2
-rw-r--r--modules/uniwidth/width-tests1
-rw-r--r--modules/vasnprintf-posix-tests2
-rw-r--r--modules/vdprintf-posix-tests1
-rw-r--r--modules/version-etc-tests1
-rw-r--r--modules/vfprintf-posix-tests1
-rw-r--r--modules/vprintf-posix-tests1
-rw-r--r--modules/wcrtomb-tests1
-rw-r--r--modules/wcsnrtombs-tests1
-rw-r--r--modules/wcsrtombs-tests1
-rw-r--r--modules/xalloc-die-tests1
-rw-r--r--modules/xprintf-posix-tests1
-rw-r--r--modules/xstrtoimax-tests1
-rw-r--r--modules/xstrtol-tests1
-rw-r--r--modules/xstrtoumax-tests1
-rw-r--r--modules/yesno-tests1
80 files changed, 122 insertions, 79 deletions
diff --git a/ChangeLog b/ChangeLog
index ef07b3d45e..6b0735259d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,93 @@
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.
* doc/gnulib.texi (Writing modules): New chapter.
(Miscellaneous Notes): Move sections "Comments" and "Header files" to
diff --git a/doc/gnulib.texi b/doc/gnulib.texi
index 198773377b..0a84691943 100644
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -559,7 +559,10 @@ check_PROGRAMS += test-foo
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:
diff --git a/gnulib-tool b/gnulib-tool
index ce1bbe949b..97fddea3f7 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2373,6 +2373,11 @@ func_emit_tests_Makefile_am ()
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."
diff --git a/modules/acl-tests b/modules/acl-tests
index c9c04cdf4a..3ab99972c6 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -19,7 +19,7 @@ AC_CHECK_DECLS_ONCE([alarm])
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@
diff --git a/modules/argp-tests b/modules/argp-tests
index 8879cceeae..8f92a4def7 100644
--- a/modules/argp-tests
+++ b/modules/argp-tests
@@ -7,6 +7,5 @@ progname
Makefile.am:
TESTS += test-argp test-argp-2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-argp
test_argp_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/argp-version-etc-tests b/modules/argp-version-etc-tests
index eeed14361a..c4451a24b7 100644
--- a/modules/argp-version-etc-tests
+++ b/modules/argp-version-etc-tests
@@ -9,6 +9,5 @@ version-etc-fsf
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@
diff --git a/modules/atexit-tests b/modules/atexit-tests
index 15de834c7c..82d6ae45af 100644
--- a/modules/atexit-tests
+++ b/modules/atexit-tests
@@ -10,5 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-atexit.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-atexit
diff --git a/modules/binary-io-tests b/modules/binary-io-tests
index e59f056715..86422e634d 100644
--- a/modules/binary-io-tests
+++ b/modules/binary-io-tests
@@ -9,6 +9,5 @@ configure.ac:
Makefile.am:
TESTS += test-binary-io.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-binary-io
diff --git a/modules/btowc-tests b/modules/btowc-tests
index 371bde95ea..cac7e616e2 100644
--- a/modules/btowc-tests
+++ b/modules/btowc-tests
@@ -15,6 +15,6 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/c-stack-tests b/modules/c-stack-tests
index 808e59e5cd..8174862869 100644
--- a/modules/c-stack-tests
+++ b/modules/c-stack-tests
@@ -11,7 +11,7 @@ configure.ac:
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
diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests
index aec09db5bc..aec55d24ca 100644
--- a/modules/c-strcase-tests
+++ b/modules/c-strcase-tests
@@ -15,5 +15,5 @@ gt_LOCALE_TR_UTF8
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
diff --git a/modules/closein-tests b/modules/closein-tests
index 57c8f91d05..5c2126e9f4 100644
--- a/modules/closein-tests
+++ b/modules/closein-tests
@@ -9,6 +9,5 @@ configure.ac:
Makefile.am:
TESTS += test-closein.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-closein
test_closein_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index c4fe4fd467..ab7f6324e7 100644
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -14,6 +14,6 @@ configure.ac:
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@
diff --git a/modules/dprintf-posix-tests b/modules/dprintf-posix-tests
index e4df83d601..a60f8eda0a 100644
--- a/modules/dprintf-posix-tests
+++ b/modules/dprintf-posix-tests
@@ -15,5 +15,4 @@ AC_CHECK_FUNCS_ONCE([getrlimit setrlimit])
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
diff --git a/modules/exclude-tests b/modules/exclude-tests
index 57b876cdb9..ba265edded 100644
--- a/modules/exclude-tests
+++ b/modules/exclude-tests
@@ -23,6 +23,5 @@ TESTS += \
test-exclude6.sh\
test-exclude7.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-exclude
test_exclude_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/fflush-tests b/modules/fflush-tests
index e439c2c78b..a447521f1f 100644
--- a/modules/fflush-tests
+++ b/modules/fflush-tests
@@ -13,6 +13,5 @@ configure.ac:
Makefile.am:
TESTS += test-fflush test-fflush2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-fflush test-fflush2
MOSTLYCLEANFILES += test-fflush.txt
diff --git a/modules/fpending-tests b/modules/fpending-tests
index bc8394c19b..31568e2920 100644
--- a/modules/fpending-tests
+++ b/modules/fpending-tests
@@ -9,6 +9,5 @@ configure.ac:
Makefile.am:
TESTS += test-fpending.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-fpending
MOSTLYCLEANFILES += test-fpending.t
diff --git a/modules/fprintf-posix-tests b/modules/fprintf-posix-tests
index 1473544742..3eebaf9cb6 100644
--- a/modules/fprintf-posix-tests
+++ b/modules/fprintf-posix-tests
@@ -18,5 +18,4 @@ AC_CHECK_FUNCS_ONCE([getrlimit setrlimit])
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
diff --git a/modules/freadahead-tests b/modules/freadahead-tests
index 13e95cd99e..1b53268a15 100644
--- a/modules/freadahead-tests
+++ b/modules/freadahead-tests
@@ -11,5 +11,4 @@ configure.ac:
Makefile.am:
TESTS += test-freadahead.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-freadahead
diff --git a/modules/freadptr-tests b/modules/freadptr-tests
index 783aea7068..f8bf1bc57d 100644
--- a/modules/freadptr-tests
+++ b/modules/freadptr-tests
@@ -13,5 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-freadptr.sh test-freadptr2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-freadptr test-freadptr2
diff --git a/modules/freadseek-tests b/modules/freadseek-tests
index e89607abaf..d101582d22 100644
--- a/modules/freadseek-tests
+++ b/modules/freadseek-tests
@@ -10,5 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-freadseek.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-freadseek
diff --git a/modules/fseek-tests b/modules/fseek-tests
index 6de889b685..45fe95934f 100644
--- a/modules/fseek-tests
+++ b/modules/fseek-tests
@@ -13,5 +13,4 @@ gl_FUNC_UNGETC_WORKS
Makefile.am:
TESTS += test-fseek.sh test-fseek2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-fseek
diff --git a/modules/fseeko-tests b/modules/fseeko-tests
index 1359970ca5..178e873182 100644
--- a/modules/fseeko-tests
+++ b/modules/fseeko-tests
@@ -13,5 +13,4 @@ gl_FUNC_UNGETC_WORKS
Makefile.am:
TESTS += test-fseeko.sh test-fseeko2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-fseeko
diff --git a/modules/ftell-tests b/modules/ftell-tests
index c669a98f41..c944ca9198 100644
--- a/modules/ftell-tests
+++ b/modules/ftell-tests
@@ -14,5 +14,4 @@ gl_FUNC_UNGETC_WORKS
Makefile.am:
TESTS += test-ftell.sh test-ftell2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-ftell
diff --git a/modules/ftello-tests b/modules/ftello-tests
index 73f659e084..c20381c133 100644
--- a/modules/ftello-tests
+++ b/modules/ftello-tests
@@ -14,5 +14,4 @@ gl_FUNC_UNGETC_WORKS
Makefile.am:
TESTS += test-ftello.sh test-ftello2.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-ftello
diff --git a/modules/idpriv-drop-tests b/modules/idpriv-drop-tests
index 5416463d9d..18596b2d1d 100644
--- a/modules/idpriv-drop-tests
+++ b/modules/idpriv-drop-tests
@@ -16,5 +16,4 @@ configure.ac:
Makefile.am:
TESTS += test-idpriv-drop.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-idpriv-drop
diff --git a/modules/idpriv-droptemp-tests b/modules/idpriv-droptemp-tests
index d6c20973d0..44c3c4dcd2 100644
--- a/modules/idpriv-droptemp-tests
+++ b/modules/idpriv-droptemp-tests
@@ -16,5 +16,4 @@ configure.ac:
Makefile.am:
TESTS += test-idpriv-droptemp.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-idpriv-droptemp
diff --git a/modules/lseek-tests b/modules/lseek-tests
index fa9a1ab4e0..890a87fb91 100644
--- a/modules/lseek-tests
+++ b/modules/lseek-tests
@@ -10,5 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-lseek.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-lseek
diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests
index e4db04d296..05d6c7fee1 100644
--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -20,7 +20,6 @@ gt_LOCALE_TR_UTF8
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@'
diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests
index 82f117fc5e..e2cc524c70 100644
--- a/modules/mbmemcasecoll-tests
+++ b/modules/mbmemcasecoll-tests
@@ -20,7 +20,6 @@ gt_LOCALE_TR_UTF8
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@'
diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests
index e97ff2f39b..d9c0d183e3 100644
--- a/modules/mbrtowc-tests
+++ b/modules/mbrtowc-tests
@@ -24,7 +24,6 @@ gt_LOCALE_ZH_CN
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@' \
diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests
index 572c83841d..9e89bfea19 100644
--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -12,6 +12,6 @@ gt_LOCALE_TR_UTF8
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
diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests
index 4c6b47420d..30f091998d 100644
--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -21,6 +21,6 @@ gt_LOCALE_ZH_CN
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
diff --git a/modules/mbschr-tests b/modules/mbschr-tests
index e08442353b..a26d8dd487 100644
--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -12,6 +12,6 @@ gt_LOCALE_ZH_CN
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
diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests
index bdb8e6a670..f31e347944 100644
--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -12,6 +12,6 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests
index 8ee370e9ae..3a8a7a01ac 100644
--- a/modules/mbsinit-tests
+++ b/modules/mbsinit-tests
@@ -14,6 +14,6 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests
index cdfe377518..81b8ba913a 100644
--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -12,6 +12,6 @@ gt_LOCALE_TR_UTF8
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
diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests
index 378d2a2cf6..1d43beb80e 100644
--- a/modules/mbsnrtowcs-tests
+++ b/modules/mbsnrtowcs-tests
@@ -25,7 +25,6 @@ gt_LOCALE_ZH_CN
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@' \
diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests
index 5582121094..d22cf198bb 100644
--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -12,6 +12,6 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests
index aab12cab12..0b1c7d3d24 100644
--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -12,6 +12,6 @@ gt_LOCALE_TR_UTF8
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
diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests
index 64d360355f..70d7c206a4 100644
--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -12,6 +12,6 @@ gt_LOCALE_ZH_CN
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
diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests
index 3d7ed88072..4b05e52f40 100644
--- a/modules/mbsrtowcs-tests
+++ b/modules/mbsrtowcs-tests
@@ -25,7 +25,6 @@ gt_LOCALE_ZH_CN
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@' \
diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests
index 95da3f21ae..ace5c766a6 100644
--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -12,6 +12,6 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests
index c36c02d494..21a8590654 100644
--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -17,6 +17,6 @@ gt_LOCALE_ZH_CN
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
diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests
index 944b1d02e0..dcb0af93c6 100644
--- a/modules/nl_langinfo-tests
+++ b/modules/nl_langinfo-tests
@@ -14,5 +14,5 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/parse-duration-tests b/modules/parse-duration-tests
index 81094deca1..b561a38ff4 100644
--- a/modules/parse-duration-tests
+++ b/modules/parse-duration-tests
@@ -10,6 +10,5 @@ configure.ac:
Makefile.am:
TESTS += test-parse-duration.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-parse-duration
test_parse_duration_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/perror-tests b/modules/perror-tests
index ca9a921a1f..867f920260 100644
--- a/modules/perror-tests
+++ b/modules/perror-tests
@@ -9,5 +9,4 @@ configure.ac:
Makefile.am:
TESTS += test-perror.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-perror
diff --git a/modules/pipe-filter-gi-tests b/modules/pipe-filter-gi-tests
index 263c7668e5..e5da562394 100644
--- a/modules/pipe-filter-gi-tests
+++ b/modules/pipe-filter-gi-tests
@@ -19,7 +19,6 @@ configure.ac:
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@
diff --git a/modules/pipe-filter-ii-tests b/modules/pipe-filter-ii-tests
index abb5fefc22..236de130b9 100644
--- a/modules/pipe-filter-ii-tests
+++ b/modules/pipe-filter-ii-tests
@@ -18,7 +18,6 @@ configure.ac:
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@
diff --git a/modules/pipe-tests b/modules/pipe-tests
index 0e31a865a6..b20ea687ad 100644
--- a/modules/pipe-tests
+++ b/modules/pipe-tests
@@ -10,6 +10,5 @@ configure.ac:
Makefile.am:
TESTS += test-pipe.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-pipe
test_pipe_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/pread-tests b/modules/pread-tests
index 8a10c1815b..72e4613bb5 100644
--- a/modules/pread-tests
+++ b/modules/pread-tests
@@ -12,5 +12,3 @@ configure.ac:
Makefile.am:
TESTS += test-pread.sh
check_PROGRAMS += test-pread
-TESTS_ENVIRONMENT += \
- srcdir='$(srcdir)'
diff --git a/modules/printf-posix-tests b/modules/printf-posix-tests
index 08c6834e82..8e8ec6de6f 100644
--- a/modules/printf-posix-tests
+++ b/modules/printf-posix-tests
@@ -16,5 +16,4 @@ AC_CHECK_FUNCS_ONCE([getrlimit setrlimit])
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
diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index 5afb98671c..b510e5d88e 100644
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -20,6 +20,6 @@ gt_LOCALE_FR_UTF8
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@
diff --git a/modules/select-tests b/modules/select-tests
index 6635e80ea7..6019b44951 100644
--- a/modules/select-tests
+++ b/modules/select-tests
@@ -31,7 +31,6 @@ AC_CHECK_HEADERS_ONCE([unistd.h sys/wait.h])
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@
diff --git a/modules/sigpipe-tests b/modules/sigpipe-tests
index 04989431c7..99107a6511 100644
--- a/modules/sigpipe-tests
+++ b/modules/sigpipe-tests
@@ -9,6 +9,5 @@ configure.ac:
Makefile.am:
TESTS += test-sigpipe.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-sigpipe
diff --git a/modules/tsearch-tests b/modules/tsearch-tests
index 0ca1114002..0c4de8b7cc 100644
--- a/modules/tsearch-tests
+++ b/modules/tsearch-tests
@@ -20,6 +20,5 @@ AC_CHECK_FUNCS_ONCE([initstate])
Makefile.am:
TESTS += test-tsearch.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-tsearch
test_tsearch_LDADD = $(LDADD) @TEST_TSEARCH_LIBM@
diff --git a/modules/unicase/locale-language-tests b/modules/unicase/locale-language-tests
index 7ea8f0e39d..bd6a21aef3 100644
--- a/modules/unicase/locale-language-tests
+++ b/modules/unicase/locale-language-tests
@@ -19,7 +19,7 @@ gt_LOCALE_ZH_CN
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@
diff --git a/modules/unicase/ulc-casecmp-tests b/modules/unicase/ulc-casecmp-tests
index 60dfe87af2..93ac72c038 100644
--- a/modules/unicase/ulc-casecmp-tests
+++ b/modules/unicase/ulc-casecmp-tests
@@ -17,7 +17,6 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/unicase/ulc-casecoll-tests b/modules/unicase/ulc-casecoll-tests
index 879156d5cd..11c6f59d8d 100644
--- a/modules/unicase/ulc-casecoll-tests
+++ b/modules/unicase/ulc-casecoll-tests
@@ -17,7 +17,6 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/uniname/uniname-tests b/modules/uniname/uniname-tests
index 6fb09173cb..6f2f7f70e2 100644
--- a/modules/uniname/uniname-tests
+++ b/modules/uniname/uniname-tests
@@ -11,7 +11,6 @@ configure.ac:
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@
diff --git a/modules/unistdio/u16-vasnprintf-tests b/modules/unistdio/u16-vasnprintf-tests
index 81a563b3f0..d67a13eceb 100644
--- a/modules/unistdio/u16-vasnprintf-tests
+++ b/modules/unistdio/u16-vasnprintf-tests
@@ -22,7 +22,7 @@ gt_LOCALE_FR_UTF8
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@
diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests
index ae0bf1a0db..73308878c7 100644
--- a/modules/unistdio/u32-vasnprintf-tests
+++ b/modules/unistdio/u32-vasnprintf-tests
@@ -22,7 +22,7 @@ gt_LOCALE_FR_UTF8
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@
diff --git a/modules/unistdio/u8-vasnprintf-tests b/modules/unistdio/u8-vasnprintf-tests
index 221b942ccd..485ca5d185 100644
--- a/modules/unistdio/u8-vasnprintf-tests
+++ b/modules/unistdio/u8-vasnprintf-tests
@@ -22,7 +22,7 @@ gt_LOCALE_FR_UTF8
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@
diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests
index 8ee22687bc..f90aaed119 100644
--- a/modules/unistdio/ulc-vasnprintf-tests
+++ b/modules/unistdio/ulc-vasnprintf-tests
@@ -18,7 +18,7 @@ gt_LOCALE_FR_UTF8
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@
diff --git a/modules/uniwbrk/ulc-wordbreaks-tests b/modules/uniwbrk/ulc-wordbreaks-tests
index ad612ffd17..3bf214d138 100644
--- a/modules/uniwbrk/ulc-wordbreaks-tests
+++ b/modules/uniwbrk/ulc-wordbreaks-tests
@@ -12,7 +12,7 @@ gt_LOCALE_FR
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@
diff --git a/modules/uniwidth/width-tests b/modules/uniwidth/width-tests
index 523d0ba6e0..c6caf1f6b2 100644
--- a/modules/uniwidth/width-tests
+++ b/modules/uniwidth/width-tests
@@ -10,7 +10,6 @@ configure.ac:
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
diff --git a/modules/vasnprintf-posix-tests b/modules/vasnprintf-posix-tests
index d3dc16889c..5320d88b35 100644
--- a/modules/vasnprintf-posix-tests
+++ b/modules/vasnprintf-posix-tests
@@ -17,5 +17,5 @@ gt_LOCALE_FR_UTF8
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
diff --git a/modules/vdprintf-posix-tests b/modules/vdprintf-posix-tests
index ffa29176b8..a7dff7acab 100644
--- a/modules/vdprintf-posix-tests
+++ b/modules/vdprintf-posix-tests
@@ -13,5 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-vdprintf-posix.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-vdprintf-posix
diff --git a/modules/version-etc-tests b/modules/version-etc-tests
index 94ff3b740b..54936db7b0 100644
--- a/modules/version-etc-tests
+++ b/modules/version-etc-tests
@@ -8,6 +8,5 @@ version-etc-fsf
Makefile.am:
TESTS += test-version-etc.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-version-etc
test_version_etc_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/vfprintf-posix-tests b/modules/vfprintf-posix-tests
index 8062cd2e8b..d4dab2d948 100644
--- a/modules/vfprintf-posix-tests
+++ b/modules/vfprintf-posix-tests
@@ -13,5 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-vfprintf-posix.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-vfprintf-posix
diff --git a/modules/vprintf-posix-tests b/modules/vprintf-posix-tests
index 66c01bdb6f..84f250b35c 100644
--- a/modules/vprintf-posix-tests
+++ b/modules/vprintf-posix-tests
@@ -13,5 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-vprintf-posix.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
check_PROGRAMS += test-vprintf-posix
diff --git a/modules/wcrtomb-tests b/modules/wcrtomb-tests
index 47ba6774ca..abedd771a0 100644
--- a/modules/wcrtomb-tests
+++ b/modules/wcrtomb-tests
@@ -20,7 +20,6 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-wcrtomb.sh
TESTS_ENVIRONMENT += \
- EXEEXT='@EXEEXT@' \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests
index dc362b9524..1745272f9d 100644
--- a/modules/wcsnrtombs-tests
+++ b/modules/wcsnrtombs-tests
@@ -22,7 +22,6 @@ gt_LOCALE_ZH_CN
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@' \
diff --git a/modules/wcsrtombs-tests b/modules/wcsrtombs-tests
index 757ce42f71..41ec9973e4 100644
--- a/modules/wcsrtombs-tests
+++ b/modules/wcsrtombs-tests
@@ -22,7 +22,6 @@ gt_LOCALE_ZH_CN
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@' \
diff --git a/modules/xalloc-die-tests b/modules/xalloc-die-tests
index 30dc3028f6..ca7acd2d9d 100644
--- a/modules/xalloc-die-tests
+++ b/modules/xalloc-die-tests
@@ -8,6 +8,5 @@ progname
Makefile.am:
TESTS += test-xalloc-die.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-xalloc-die
test_xalloc_die_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/xprintf-posix-tests b/modules/xprintf-posix-tests
index 22e01ca88e..7882b43e1b 100644
--- a/modules/xprintf-posix-tests
+++ b/modules/xprintf-posix-tests
@@ -15,7 +15,6 @@ configure.ac:
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@
diff --git a/modules/xstrtoimax-tests b/modules/xstrtoimax-tests
index da7cb155de..cf7acfd23b 100644
--- a/modules/xstrtoimax-tests
+++ b/modules/xstrtoimax-tests
@@ -8,6 +8,5 @@ configure.ac:
Makefile.am:
TESTS += test-xstrtoimax.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-xstrtoimax
test_xstrtoimax_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/xstrtol-tests b/modules/xstrtol-tests
index b466338e85..91b74b367c 100644
--- a/modules/xstrtol-tests
+++ b/modules/xstrtol-tests
@@ -9,7 +9,6 @@ configure.ac:
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@
diff --git a/modules/xstrtoumax-tests b/modules/xstrtoumax-tests
index 8540365eba..67b30c5c6e 100644
--- a/modules/xstrtoumax-tests
+++ b/modules/xstrtoumax-tests
@@ -8,6 +8,5 @@ configure.ac:
Makefile.am:
TESTS += test-xstrtoumax.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-xstrtoumax
test_xstrtoumax_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/yesno-tests b/modules/yesno-tests
index 3d484dac04..01ba8e1de6 100644
--- a/modules/yesno-tests
+++ b/modules/yesno-tests
@@ -10,6 +10,5 @@ configure.ac:
Makefile.am:
TESTS += test-yesno.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
check_PROGRAMS += test-yesno
test_yesno_LDADD = $(LDADD) @LIBINTL@