1240 files changed, 1360 insertions, 1366 deletions

diff --git a/.gitignore b/.gitignore
index f7d9c2a7e..247c462c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 /configure
 /Makefile.in
 /Makefile
-/tests/Makefile.in
-/tests/Makefile
+/t/Makefile.in
+/t/Makefile
 /.autom4te.cache
 /config.cache
 /config.log
@@ -34,18 +34,18 @@
 /doc/amhello/install-sh
 /doc/amhello/missing
 /lib/Automake/Config.pm
-/tests/wrap/aclocal-1.*
-/tests/wrap/automake-1.*
-/tests/defs-static
-/tests/testsuite-part.am
-/tests/*-w.tap
-/tests/*-w.test
-/tests/depcomp-*.tap
-/tests/*.dir
-/tests/*.log
-/tests/*.trs
-/tests/pm/*.log
-/tests/pm/*.trs
+/t/wrap/aclocal-1.*
+/t/wrap/automake-1.*
+/t/defs-static
+/t/testsuite-part.am
+/t/*-w.tap
+/t/*-w.sh
+/t/depcomp-*.tap
+/t/*.dir
+/t/*.log
+/t/*.trs
+/t/pm/*.log
+/t/pm/*.trs
 cscope.files
 cscope.in.out
 cscope.out
diff --git a/Makefile.am b/Makefile.am
index 3eae563d6..c04db281f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-## '.' goes before tests, because this latter directory runs
+## '.' goes before 't', because this latter directory runs
 ## aclocal and automake.
-SUBDIRS = . tests
+SUBDIRS = . t
 
 ## Might be updated later.
 CLEANFILES =
@@ -101,7 +101,7 @@ INSTALL: lib/INSTALL
 
 # Convenience proxy target for the test suites.
 recheck:
-	$(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
+	$(am__cd) t && $(MAKE) $(AM_MAKEFLAGS) $@
 .PHONY: recheck
 
 # We don't use the default name for the autom4te cache directory,
@@ -338,7 +338,7 @@ MAINTAINERCLEANFILES += $(dist_man1_MANS)
 update_mans = \
   $(AM_V_GEN): \
     && $(MAKE) $(AM_MAKEFLAGS) lib/Automake/Config.pm \
-    && PATH="$(abs_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" \
+    && PATH="$(abs_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
     && export PATH \
     && $(HELP2MAN) --output=$@
 
@@ -381,10 +381,10 @@ dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
 # We depend on configure.ac so that we regenerate the tarball
 # whenever the Automake version changes.
 # aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
-# configure in tests/.
+# configure in 't/wrap'.
 $(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
 	$(AM_V_GEN): \
-	  && PATH="$(abs_top_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" \
+	  && PATH="$(abs_top_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
 	  && export PATH \
 	  && $(am__cd) $(srcdir)/doc/amhello \
 	  && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
@@ -490,7 +490,7 @@ ChangeLog: am--changelog-regen-hook
 # Ensure tests are world-executable.
 # FIXME: this should be turned into a maintainer check...
 dist-hook:
-	$(am__cd) $(distdir)/tests && chmod a+rx *.test
+	$(am__cd) $(distdir)/t && chmod a+rx *.sh *.tap
 
 
 ## --------------------------- ##
diff --git a/README b/README
index 9b1477b3c..d69fbd4f4 100644
--- a/README
+++ b/README
@@ -21,7 +21,7 @@ macros which can be automatically used by aclocal.  The documentation
 for aclocal is currently found in the Automake manual.
 
 Automake has a test suite.  Use "make check" to run it.  For more
-information, see the file tests/README.
+information, see the file t/README.
 
 Automake has a page on the web.  See:
 
diff --git a/bootstrap b/bootstrap
index c6257166e..c6e9ca15f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -103,7 +103,7 @@ dosubst m4/amversion.in m4/amversion.m4
 dosubst automake.in automake.tmp
 
 # Create required makefile snippets.
-cd tests
+cd t
 $PERL ./gen-testsuite-part > testsuite-part.tmp
 chmod a-w testsuite-part.tmp
 mv -f testsuite-part.tmp testsuite-part.am
diff --git a/configure.ac b/configure.ac
index ae5163fdf..021d4ec03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,9 +217,9 @@ else
 fi
 ])
 if test $am_cv_sh_errexit_works = no; then
-  AC_MSG_WARN(["${MAKE-make} check" will leave leftover directories tests/*.dir])
+  AC_MSG_WARN(["${MAKE-make} check" will leave leftover directories t/*.dir])
   AC_MSG_WARN([you can clean them up manually using "${MAKE-make} clean" or])
-  AC_MSG_WARN(["cd tests && ${MAKE-make} clean-local-check'])
+  AC_MSG_WARN(["cd t && ${MAKE-make} clean-local-check'])
 fi
 AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
 
@@ -395,14 +395,14 @@ AC_SUBST([EXEEXT])
 
 ###########################################################################
 
-AC_CONFIG_FILES([Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile t/Makefile])
 AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
-AC_CONFIG_LINKS([tests/defs:tests/defs])
-AC_CONFIG_FILES([tests/wrap/aclocal-${APIVERSION}:tests/wrap/aclocal.in],
-                [chmod +x tests/wrap/aclocal-${APIVERSION}],
+AC_CONFIG_LINKS([t/defs:t/defs])
+AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in],
+                [chmod +x t/wrap/aclocal-${APIVERSION}],
 	        [APIVERSION=$APIVERSION])
-AC_CONFIG_FILES([tests/wrap/automake-${APIVERSION}:tests/wrap/automake.in],
-                [chmod +x tests/wrap/automake-${APIVERSION}],
+AC_CONFIG_FILES([t/wrap/automake-${APIVERSION}:t/wrap/automake.in],
+                [chmod +x t/wrap/automake-${APIVERSION}],
 	        [APIVERSION=$APIVERSION])
 
 AC_OUTPUT
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 79f285f96..0016eafe7 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -26,10 +26,9 @@ xtests := $(shell \
      dirs='$(srcdir) .'; \
    fi; \
    for d in $$dirs; do \
-     for s in test tap sh; do \
-       ls $$d/tests/*.$$s 2>/dev/null; \
+     for s in tap sh; do \
+       ls $$d/t/*.$$s $$d/t/ax/*.$$s 2>/dev/null; \
      done; \
-     ls $$d/tests/ax/*.sh 2>/dev/null; \
    done | sort)
 
 ams := $(shell find $(srcdir) -name '*.am')
@@ -304,8 +303,8 @@ sc_tests_obsolete_variables:
 	seen=""; \
 	for v in $$vars; do \
 	  if grep -E "\b$$v\b" \
-	    $(xtests) $(srcdir)/tests/defs \
-	    $(srcdir)/tests/defs-static.in \
+	    $(xtests) $(srcdir)/t/defs \
+	    $(srcdir)/t/defs-static.in \
 	  ; then \
 	    seen="$$seen $$v"; \
 	  fi; \
@@ -376,7 +375,7 @@ sc_tests_here_document_format:
 
 ## Tests should never call exit directly, but use Exit.
 ## This is so that the exit status is transported correctly across the 0 trap.
-## Ignore comments, testsuite self tests, and one perl line in ext2.test.
+## Ignore comments, testsuite self tests, and one perl line in ext2.sh.
 sc_tests_Exit_not_exit:
 	@found=false; for file in $(xtests); do \
 	  case $$file in */self-check-*) continue;; esac; \
@@ -438,11 +437,11 @@ sc_tests_overriding_macros_on_cmdline:
 # The first s/// tries to account for usages like "$MAKE || st=$?".
 # 'DISTCHECK_CONFIGURE_FLAGS' and 'exp' are allowed to contain whitespace in
 # their definitions, hence the more complex last three substitutions below.
-# Also, the 'make-dryrun.test' is whitelisted, since there we need to
+# Also, the 'make-dryrun.sh' is whitelisted, since there we need to
 # override variables from the command line in order to cover the expected
 # code paths.
 	@tests=`for t in $(xtests); do \
-	          case $$t in */make-dryrun.test);; *) echo $$t;; esac; \
+	          case $$t in */make-dryrun.sh);; *) echo $$t;; esac; \
 		done`; \
 	if sed -e 's/ || .*//' -e 's/ && .*//' \
 	        -e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \
@@ -488,10 +487,10 @@ sc_tests_plain_egrep_fgrep:
 ## for configure input files in our testsuite.  The latter  has been
 ## deprecated for several years (at least since autoconf 2.50).
 sc_tests_no_configure_in:
-	@if grep -E '\bconfigure\\*\.in\b' $(xtests) $(srcdir)/tests/defs \
-	      | grep -Ev '/backcompat.*\.(test|tap):' \
-	      | grep -Ev '/autodist-configure-no-subdir\.test:' \
-	      | grep -Ev '/(configure|help)\.test:' \
+	@if grep -E '\bconfigure\\*\.in\b' $(xtests) $(srcdir)/t/defs \
+	      | grep -Ev '/backcompat.*\.(sh|tap):' \
+	      | grep -Ev '/autodist-configure-no-subdir\.sh:' \
+	      | grep -Ev '/(configure|help)\.sh:' \
 	      | grep .; \
 	then \
 	  echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
@@ -505,7 +504,7 @@ sc_tests_no_configure_in:
 ## AM_RECURSIVE_TARGETS.  Suggest keeping test directories around for
 ## greppability of the Makefile.in files.
 sc_ensure_testsuite_has_run:
-	@if test ! -f tests/test-suite.log; then \
+	@if test ! -f t/test-suite.log; then \
 	  echo 'Run "env keep_testdirs=yes make check" before' \
 	       'running "make maintainer-check"' >&2; \
 	  exit 1; \
@@ -515,7 +514,7 @@ sc_ensure_testsuite_has_run:
 ## Ensure our warning and error messages do not contain duplicate 'warning:' prefixes.
 ## This test actually depends on the testsuite having been run before.
 sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run
-	@if grep -E '(warning|error):.*(warning|error):' tests/*.log; then \
+	@if grep -E '(warning|error):.*(warning|error):' t/*.log; then \
 	  echo 'Duplicate warning/error message prefixes seen in above tests.' >&2; \
 	  exit 1; \
 	fi
@@ -523,7 +522,7 @@ sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run
 ## Ensure variables are listed before rules in Makefile.in files we generate.
 sc_tests_makefile_variable_order: sc_ensure_testsuite_has_run
 	@st=0; \
-	for file in `find tests -name Makefile.in -print`; do \
+	for file in `find t -name Makefile.in -print`; do \
 	  latevars=`sed -n \
 	    -e :x -e 's/#.*//' \
 	    -e '/\\\\$$/{' -e N -e 'b x' -e '}' \
diff --git a/tests/CheckListOfTests.am b/t/CheckListOfTests.am
index a3913f2cd..a3913f2cd 100644
--- a/tests/CheckListOfTests.am
+++ b/t/CheckListOfTests.am
diff --git a/tests/Makefile.am b/t/Makefile.am
index 5cb478ea7..ca00f3735 100644
--- a/tests/Makefile.am
+++ b/t/Makefile.am
@@ -18,8 +18,8 @@
 # Run the tests with the shell detected at configure time.
 LOG_COMPILER = $(SHELL)
 
-TEST_EXTENSIONS = .pl .test .tap
-TEST_LOG_COMPILER = $(LOG_COMPILER)
+TEST_EXTENSIONS = .pl .sh .tap
+SH_LOG_COMPILER = $(LOG_COMPILER)
 TAP_LOG_COMPILER = $(LOG_COMPILER)
 PL_LOG_COMPILER = $(PERL)
 AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I $(top_srcdir)/lib -w
diff --git a/tests/README b/t/README
index 33a653c71..33a653c71 100644
--- a/tests/README
+++ b/t/README
diff --git a/tests/ac-output-old.tap b/t/ac-output-old.tap
index 5c906a2f0..5c906a2f0 100755
--- a/tests/ac-output-old.tap
+++ b/t/ac-output-old.tap
diff --git a/tests/acloca10.test b/t/acloca10.sh
index 05db9b9ab..05db9b9ab 100755
--- a/tests/acloca10.test
+++ b/t/acloca10.sh
diff --git a/tests/acloca11.test b/t/acloca11.sh
index 7a1cff609..7a1cff609 100755
--- a/tests/acloca11.test
+++ b/t/acloca11.sh
diff --git a/tests/acloca12.test b/t/acloca12.sh
index 958238e1b..958238e1b 100755
--- a/tests/acloca12.test
+++ b/t/acloca12.sh
diff --git a/tests/acloca13.test b/t/acloca13.sh
index e91a534ed..e91a534ed 100755
--- a/tests/acloca13.test
+++ b/t/acloca13.sh
diff --git a/tests/acloca14.test b/t/acloca14.sh
index ba1f07228..ba1f07228 100755
--- a/tests/acloca14.test
+++ b/t/acloca14.sh
diff --git a/tests/acloca15.test b/t/acloca15.sh
index 690c06c67..690c06c67 100755
--- a/tests/acloca15.test
+++ b/t/acloca15.sh
diff --git a/tests/acloca16.test b/t/acloca16.sh
index ab894c739..ab894c739 100755
--- a/tests/acloca16.test
+++ b/t/acloca16.sh
diff --git a/tests/acloca17.test b/t/acloca17.sh
index e6098f0a6..e6098f0a6 100755
--- a/tests/acloca17.test
+++ b/t/acloca17.sh
diff --git a/tests/acloca18.test b/t/acloca18.sh
index c0510e10d..c0510e10d 100755
--- a/tests/acloca18.test
+++ b/t/acloca18.sh
diff --git a/tests/acloca19.test b/t/acloca19.sh
index 60e8afe49..60e8afe49 100755
--- a/tests/acloca19.test
+++ b/t/acloca19.sh
diff --git a/tests/acloca20.test b/t/acloca20.sh
index 030506639..030506639 100755
--- a/tests/acloca20.test
+++ b/t/acloca20.sh
diff --git a/tests/acloca21.test b/t/acloca21.sh
index d9b47afc2..d9b47afc2 100755
--- a/tests/acloca21.test
+++ b/t/acloca21.sh
diff --git a/tests/acloca22.test b/t/acloca22.sh
index 85ef29b4a..85ef29b4a 100755
--- a/tests/acloca22.test
+++ b/t/acloca22.sh
diff --git a/tests/acloca23.test b/t/acloca23.sh
index b5f66e4ce..b5f66e4ce 100755
--- a/tests/acloca23.test
+++ b/t/acloca23.sh
diff --git a/tests/aclocal-acdir.test b/t/aclocal-acdir.sh
index 88caef62f..88caef62f 100755
--- a/tests/aclocal-acdir.test
+++ b/t/aclocal-acdir.sh
diff --git a/tests/aclocal-install-absdir.test b/t/aclocal-install-absdir.sh
index b07f7fac9..b07f7fac9 100755
--- a/tests/aclocal-install-absdir.test
+++ b/t/aclocal-install-absdir.sh
diff --git a/tests/aclocal-install-fail.test b/t/aclocal-install-fail.sh
index c458239a5..c458239a5 100755
--- a/tests/aclocal-install-fail.test
+++ b/t/aclocal-install-fail.sh
diff --git a/tests/aclocal-install-mkdir.test b/t/aclocal-install-mkdir.sh
index 71d09affe..71d09affe 100755
--- a/tests/aclocal-install-mkdir.test
+++ b/t/aclocal-install-mkdir.sh
diff --git a/tests/aclocal-no-install-no-mkdir.test b/t/aclocal-no-install-no-mkdir.sh
index 728e70a05..728e70a05 100755
--- a/tests/aclocal-no-install-no-mkdir.test
+++ b/t/aclocal-no-install-no-mkdir.sh
diff --git a/tests/aclocal-path-install-serial.test b/t/aclocal-path-install-serial.sh
index 8a2b22c59..8a2b22c59 100755
--- a/tests/aclocal-path-install-serial.test
+++ b/t/aclocal-path-install-serial.sh
diff --git a/tests/aclocal-path-install.test b/t/aclocal-path-install.sh
index a9a8b97c6..a9a8b97c6 100755
--- a/tests/aclocal-path-install.test
+++ b/t/aclocal-path-install.sh
diff --git a/tests/aclocal-path-nonexistent.test b/t/aclocal-path-nonexistent.sh
index 8c42ddc65..8c42ddc65 100755
--- a/tests/aclocal-path-nonexistent.test
+++ b/t/aclocal-path-nonexistent.sh
diff --git a/tests/aclocal-path-precedence.test b/t/aclocal-path-precedence.sh
index 91d9a424c..91d9a424c 100755
--- a/tests/aclocal-path-precedence.test
+++ b/t/aclocal-path-precedence.sh
diff --git a/tests/aclocal-path.test b/t/aclocal-path.sh
index d1279f021..d1279f021 100755
--- a/tests/aclocal-path.test
+++ b/t/aclocal-path.sh
diff --git a/tests/aclocal-print-acdir.test b/t/aclocal-print-acdir.sh
index 3d8bf4e7d..3d8bf4e7d 100755
--- a/tests/aclocal-print-acdir.test
+++ b/t/aclocal-print-acdir.sh
diff --git a/tests/aclocal-verbose-install.test b/t/aclocal-verbose-install.sh
index d854719c8..d854719c8 100755
--- a/tests/aclocal-verbose-install.test
+++ b/t/aclocal-verbose-install.sh
diff --git a/tests/aclocal.test b/t/aclocal.sh
index 4030b1372..4030b1372 100755
--- a/tests/aclocal.test
+++ b/t/aclocal.sh
diff --git a/tests/aclocal3.test b/t/aclocal3.sh
index b2d2ab967..b2d2ab967 100755
--- a/tests/aclocal3.test
+++ b/t/aclocal3.sh
diff --git a/tests/aclocal4.test b/t/aclocal4.sh
index bc80f64cd..bc80f64cd 100755
--- a/tests/aclocal4.test
+++ b/t/aclocal4.sh
diff --git a/tests/aclocal5.test b/t/aclocal5.sh
index 23a7e5e55..23a7e5e55 100755
--- a/tests/aclocal5.test
+++ b/t/aclocal5.sh
diff --git a/tests/aclocal6.test b/t/aclocal6.sh
index 8923851cd..8923851cd 100755
--- a/tests/aclocal6.test
+++ b/t/aclocal6.sh
diff --git a/tests/aclocal7.test b/t/aclocal7.sh
index 548d89017..548d89017 100755
--- a/tests/aclocal7.test
+++ b/t/aclocal7.sh
diff --git a/tests/aclocal8.test b/t/aclocal8.sh
index 8df0835bc..8df0835bc 100755
--- a/tests/aclocal8.test
+++ b/t/aclocal8.sh
diff --git a/tests/aclocal9.test b/t/aclocal9.sh
index c7ce7514e..c7ce7514e 100755
--- a/tests/aclocal9.test
+++ b/t/aclocal9.sh
diff --git a/tests/acsilent.test b/t/acsilent.sh
index 0f9c1cbb0..0f9c1cbb0 100755
--- a/tests/acsilent.test
+++ b/t/acsilent.sh
diff --git a/tests/acsubst.test b/t/acsubst.sh
index 9390944c3..9390944c3 100755
--- a/tests/acsubst.test
+++ b/t/acsubst.sh
diff --git a/tests/acsubst2.test b/t/acsubst2.sh
index e8c866359..e8c866359 100755
--- a/tests/acsubst2.test
+++ b/t/acsubst2.sh
diff --git a/tests/add-missing.tap b/t/add-missing.tap
index 39b7ae7f6..39b7ae7f6 100755
--- a/tests/add-missing.tap
+++ b/t/add-missing.tap
diff --git a/tests/all.test b/t/all.sh
index 0baf9da24..0baf9da24 100755
--- a/tests/all.test
+++ b/t/all.sh
diff --git a/tests/all2.test b/t/all2.sh
index da22e68d5..da22e68d5 100755
--- a/tests/all2.test
+++ b/t/all2.sh
diff --git a/tests/alloca.test b/t/alloca.sh
index c87904b3d..c87904b3d 100755
--- a/tests/alloca.test
+++ b/t/alloca.sh
diff --git a/tests/alloca2.test b/t/alloca2.sh
index 08fad97dd..08fad97dd 100755
--- a/tests/alloca2.test
+++ b/t/alloca2.sh
diff --git a/tests/alpha.test b/t/alpha.sh
index 90f2cc267..90f2cc267 100755
--- a/tests/alpha.test
+++ b/t/alpha.sh
diff --git a/tests/alpha2.test b/t/alpha2.sh
index 6d5207f61..6d5207f61 100755
--- a/tests/alpha2.test
+++ b/t/alpha2.sh
diff --git a/tests/am-tests-environment.test b/t/am-tests-environment.sh
index 3a6e75532..3a6e75532 100755
--- a/tests/am-tests-environment.test
+++ b/t/am-tests-environment.sh
diff --git a/tests/amassign.test b/t/amassign.sh
index 1649dd080..1649dd080 100755
--- a/tests/amassign.test
+++ b/t/amassign.sh
diff --git a/tests/amhello-binpkg.test b/t/amhello-binpkg.sh
index 4b3e0e21b..4b3e0e21b 100755
--- a/tests/amhello-binpkg.test
+++ b/t/amhello-binpkg.sh
diff --git a/tests/amhello-cflags.test b/t/amhello-cflags.sh
index 4132bc177..4132bc177 100755
--- a/tests/amhello-cflags.test
+++ b/t/amhello-cflags.sh
diff --git a/tests/amhello-cross-compile.test b/t/amhello-cross-compile.sh
index b138d87c8..b138d87c8 100755
--- a/tests/amhello-cross-compile.test
+++ b/t/amhello-cross-compile.sh
diff --git a/tests/ammissing.test b/t/ammissing.sh
index aa281267c..aa281267c 100755
--- a/tests/ammissing.test
+++ b/t/ammissing.sh
diff --git a/tests/amopt.test b/t/amopt.sh
index 786118410..786118410 100755
--- a/tests/amopt.test
+++ b/t/amopt.sh
diff --git a/tests/amopts-location.test b/t/amopts-location.sh
index 0219f1854..0219f1854 100755
--- a/tests/amopts-location.test
+++ b/t/amopts-location.sh
diff --git a/tests/amopts-variable-expansion.test b/t/amopts-variable-expansion.sh
index 8a035d126..8a035d126 100755
--- a/tests/amopts-variable-expansion.test
+++ b/t/amopts-variable-expansion.sh
diff --git a/tests/amsubst.test b/t/amsubst.sh
index b655ce472..b655ce472 100755
--- a/tests/amsubst.test
+++ b/t/amsubst.sh
diff --git a/tests/ansi2knr-no-more.test b/t/ansi2knr-no-more.sh
index fb2e2a546..fb2e2a546 100755
--- a/tests/ansi2knr-no-more.test
+++ b/t/ansi2knr-no-more.sh
diff --git a/tests/ar-lib.test b/t/ar-lib.sh
index 1ddec64d8..1ddec64d8 100755
--- a/tests/ar-lib.test
+++ b/t/ar-lib.sh
diff --git a/tests/ar-lib2.test b/t/ar-lib2.sh
index 7d7e9b588..7d7e9b588 100755
--- a/tests/ar-lib2.test
+++ b/t/ar-lib2.sh
diff --git a/tests/ar-lib3.test b/t/ar-lib3.sh
index 02696f62d..02696f62d 100755
--- a/tests/ar-lib3.test
+++ b/t/ar-lib3.sh
diff --git a/tests/ar-lib4.test b/t/ar-lib4.sh
index d1be2eb41..d1be2eb41 100755
--- a/tests/ar-lib4.test
+++ b/t/ar-lib4.sh
diff --git a/tests/ar-lib5a.test b/t/ar-lib5a.sh
index 1987936b9..1987936b9 100755
--- a/tests/ar-lib5a.test
+++ b/t/ar-lib5a.sh
diff --git a/tests/ar-lib5b.test b/t/ar-lib5b.sh
index 2fb0cf43e..2fb0cf43e 100755
--- a/tests/ar-lib5b.test
+++ b/t/ar-lib5b.sh
diff --git a/tests/ar-lib6a.test b/t/ar-lib6a.sh
index be6afcd3f..be6afcd3f 100755
--- a/tests/ar-lib6a.test
+++ b/t/ar-lib6a.sh
diff --git a/tests/ar-lib6b.test b/t/ar-lib6b.sh
index 54c02225e..54c02225e 100755
--- a/tests/ar-lib6b.test
+++ b/t/ar-lib6b.sh
diff --git a/tests/ar-lib7.test b/t/ar-lib7.sh
index 34e6c6e53..34e6c6e53 100755
--- a/tests/ar-lib7.test
+++ b/t/ar-lib7.sh
diff --git a/tests/ar.test b/t/ar.sh
index b8d9901a0..b8d9901a0 100755
--- a/tests/ar.test
+++ b/t/ar.sh
diff --git a/tests/ar2.test b/t/ar2.sh
index c71afea09..c71afea09 100755
--- a/tests/ar2.test
+++ b/t/ar2.sh
diff --git a/tests/ar3.test b/t/ar3.sh
index ba0b4b737..ba0b4b737 100755
--- a/tests/ar3.test
+++ b/t/ar3.sh
diff --git a/tests/ar4.test b/t/ar4.sh
index 424a77675..424a77675 100755
--- a/tests/ar4.test
+++ b/t/ar4.sh
diff --git a/tests/ar5.test b/t/ar5.sh
index 711fad6a1..711fad6a1 100755
--- a/tests/ar5.test
+++ b/t/ar5.sh
diff --git a/tests/asm.test b/t/asm.sh
index b9a958d1a..b9a958d1a 100755
--- a/tests/asm.test
+++ b/t/asm.sh
diff --git a/tests/asm2.test b/t/asm2.sh
index 737d46d4f..737d46d4f 100755
--- a/tests/asm2.test
+++ b/t/asm2.sh
diff --git a/tests/asm3.test b/t/asm3.sh
index f7f835a1f..f7f835a1f 100755
--- a/tests/asm3.test
+++ b/t/asm3.sh
diff --git a/tests/autodist-acconfig-no-subdir.test b/t/autodist-acconfig-no-subdir.sh
index d4ad1d960..d4ad1d960 100755
--- a/tests/autodist-acconfig-no-subdir.test
+++ b/t/autodist-acconfig-no-subdir.sh
diff --git a/tests/autodist-acconfig.test b/t/autodist-acconfig.sh
index 18b280c3c..18b280c3c 100755
--- a/tests/autodist-acconfig.test
+++ b/t/autodist-acconfig.sh
diff --git a/tests/autodist-aclocal-m4.test b/t/autodist-aclocal-m4.sh
index 6108f5743..6108f5743 100755
--- a/tests/autodist-aclocal-m4.test
+++ b/t/autodist-aclocal-m4.sh
diff --git a/tests/autodist-config-headers.test b/t/autodist-config-headers.sh
index 65888f813..65888f813 100755
--- a/tests/autodist-config-headers.test
+++ b/t/autodist-config-headers.sh
diff --git a/tests/autodist-configure-no-subdir.test b/t/autodist-configure-no-subdir.sh
index cc53cafcc..cc53cafcc 100755
--- a/tests/autodist-configure-no-subdir.test
+++ b/t/autodist-configure-no-subdir.sh
diff --git a/tests/autodist-no-duplicate.test b/t/autodist-no-duplicate.sh
index 90a2c7dfc..90a2c7dfc 100755
--- a/tests/autodist-no-duplicate.test
+++ b/t/autodist-no-duplicate.sh
diff --git a/tests/autodist-stamp-vti.test b/t/autodist-stamp-vti.sh
index 4db1f141e..4db1f141e 100755
--- a/tests/autodist-stamp-vti.test
+++ b/t/autodist-stamp-vti.sh
diff --git a/tests/autodist-subdir.test b/t/autodist-subdir.sh
index 5e1f044e9..5e1f044e9 100755
--- a/tests/autodist-subdir.test
+++ b/t/autodist-subdir.sh
diff --git a/tests/autodist.test b/t/autodist.sh
index e6435c54c..e6435c54c 100755
--- a/tests/autodist.test
+++ b/t/autodist.sh
diff --git a/tests/autohdr.test b/t/autohdr.sh
index bef7027fe..bef7027fe 100755
--- a/tests/autohdr.test
+++ b/t/autohdr.sh
diff --git a/tests/autohdr2.test b/t/autohdr2.sh
index 6f5415e00..6f5415e00 100755
--- a/tests/autohdr2.test
+++ b/t/autohdr2.sh
diff --git a/tests/autohdr3.test b/t/autohdr3.sh
index ad5513059..ad5513059 100755
--- a/tests/autohdr3.test
+++ b/t/autohdr3.sh
diff --git a/tests/autohdr4.test b/t/autohdr4.sh
index 9acbab135..9acbab135 100755
--- a/tests/autohdr4.test
+++ b/t/autohdr4.sh
diff --git a/tests/autohdrdry.test b/t/autohdrdry.sh
index 9df36f1e4..9df36f1e4 100755
--- a/tests/autohdrdry.test
+++ b/t/autohdrdry.sh
diff --git a/tests/automake-cmdline.tap b/t/automake-cmdline.tap
index 72c559a4b..72c559a4b 100755
--- a/tests/automake-cmdline.tap
+++ b/t/automake-cmdline.tap
diff --git a/tests/auxdir-autodetect.test b/t/auxdir-autodetect.sh
index 790d1b152..790d1b152 100755
--- a/tests/auxdir-autodetect.test
+++ b/t/auxdir-autodetect.sh
diff --git a/tests/auxdir-computed.tap b/t/auxdir-computed.tap
index 487958df7..487958df7 100755
--- a/tests/auxdir-computed.tap
+++ b/t/auxdir-computed.tap
diff --git a/tests/auxdir-misplaced.test b/t/auxdir-misplaced.sh
index 33f5db061..33f5db061 100755
--- a/tests/auxdir-misplaced.test
+++ b/t/auxdir-misplaced.sh
diff --git a/tests/auxdir-nonexistent.test b/t/auxdir-nonexistent.sh
index 5575b284d..5575b284d 100755
--- a/tests/auxdir-nonexistent.test
+++ b/t/auxdir-nonexistent.sh
diff --git a/tests/auxdir-unportable.tap b/t/auxdir-unportable.tap
index d04b38c89..d04b38c89 100755
--- a/tests/auxdir-unportable.tap
+++ b/t/auxdir-unportable.tap
diff --git a/tests/auxdir.test b/t/auxdir.sh
index c4860f4d2..c4860f4d2 100755
--- a/tests/auxdir.test
+++ b/t/auxdir.sh
diff --git a/tests/auxdir6.test b/t/auxdir6.sh
index 08de2415a..08de2415a 100755
--- a/tests/auxdir6.test
+++ b/t/auxdir6.sh
diff --git a/tests/auxdir7.test b/t/auxdir7.sh
index 9a32bcbb8..9a32bcbb8 100755
--- a/tests/auxdir7.test
+++ b/t/auxdir7.sh
diff --git a/tests/auxdir8.test b/t/auxdir8.sh
index 4dd083549..4dd083549 100755
--- a/tests/auxdir8.test
+++ b/t/auxdir8.sh
diff --git a/tests/ax/depcomp.sh b/t/ax/depcomp.sh
index a9180e937..a9180e937 100644
--- a/tests/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
diff --git a/tests/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
index 5d36102c6..5d36102c6 100644
--- a/tests/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
diff --git a/tests/ax/extract-testsuite-summary.pl b/t/ax/extract-testsuite-summary.pl
index 28a9c3560..28a9c3560 100644
--- a/tests/ax/extract-testsuite-summary.pl
+++ b/t/ax/extract-testsuite-summary.pl
diff --git a/tests/ax/is b/t/ax/is
index 1e1c0ce48..1e1c0ce48 100755
--- a/tests/ax/is
+++ b/t/ax/is
diff --git a/tests/ax/plain-functions.sh b/t/ax/plain-functions.sh
index e6483dc0f..e6483dc0f 100644
--- a/tests/ax/plain-functions.sh
+++ b/t/ax/plain-functions.sh
diff --git a/tests/ax/tap-functions.sh b/t/ax/tap-functions.sh
index 3a5db0309..3a5db0309 100644
--- a/tests/ax/tap-functions.sh
+++ b/t/ax/tap-functions.sh
diff --git a/tests/ax/tap-setup.sh b/t/ax/tap-setup.sh
index ab155057a..ab155057a 100644
--- a/tests/ax/tap-setup.sh
+++ b/t/ax/tap-setup.sh
diff --git a/tests/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 6965281bc..6965281bc 100644
--- a/tests/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
diff --git a/tests/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 309d47345..309d47345 100644
--- a/tests/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
diff --git a/tests/ax/trivial-test-driver b/t/ax/trivial-test-driver
index 3968acbf4..3968acbf4 100644
--- a/tests/ax/trivial-test-driver
+++ b/t/ax/trivial-test-driver
diff --git a/tests/backcompat.test b/t/backcompat.sh
index ec8292c12..ec8292c12 100755
--- a/tests/backcompat.test
+++ b/t/backcompat.sh
diff --git a/tests/backcompat2.test b/t/backcompat2.sh
index ba9ec3b93..ba9ec3b93 100755
--- a/tests/backcompat2.test
+++ b/t/backcompat2.sh
diff --git a/tests/backcompat3.test b/t/backcompat3.sh
index 2377e8876..2377e8876 100755
--- a/tests/backcompat3.test
+++ b/t/backcompat3.sh
diff --git a/tests/backcompat4.test b/t/backcompat4.sh
index 9088aae1f..9088aae1f 100755
--- a/tests/backcompat4.test
+++ b/t/backcompat4.sh
diff --git a/tests/backcompat5.test b/t/backcompat5.sh
index 3aa90679e..3aa90679e 100755
--- a/tests/backcompat5.test
+++ b/t/backcompat5.sh
diff --git a/tests/backcompat6.test b/t/backcompat6.sh
index fde118b1c..fde118b1c 100755
--- a/tests/backcompat6.test
+++ b/t/backcompat6.sh
diff --git a/tests/backsl.test b/t/backsl.sh
index 48d70c719..48d70c719 100755
--- a/tests/backsl.test
+++ b/t/backsl.sh
diff --git a/tests/backsl2.test b/t/backsl2.sh
index 82e2f084e..82e2f084e 100755
--- a/tests/backsl2.test
+++ b/t/backsl2.sh
diff --git a/tests/backsl3.test b/t/backsl3.sh
index 36fab7f32..36fab7f32 100755
--- a/tests/backsl3.test
+++ b/t/backsl3.sh
diff --git a/tests/backsl4.test b/t/backsl4.sh
index c11d20d47..c11d20d47 100755
--- a/tests/backsl4.test
+++ b/t/backsl4.sh
diff --git a/tests/badline.test b/t/badline.sh
index 3f548f75d..3f548f75d 100755
--- a/tests/badline.test
+++ b/t/badline.sh
diff --git a/tests/badopt.test b/t/badopt.sh
index b06657f27..b06657f27 100755
--- a/tests/badopt.test
+++ b/t/badopt.sh
diff --git a/tests/badprog.test b/t/badprog.sh
index 81ff5b76c..81ff5b76c 100755
--- a/tests/badprog.test
+++ b/t/badprog.sh
diff --git a/tests/block.test b/t/block.sh
index a6e9e3255..a6e9e3255 100755
--- a/tests/block.test
+++ b/t/block.sh
diff --git a/tests/bsource.test b/t/bsource.sh
index 482015f3e..482015f3e 100755
--- a/tests/bsource.test
+++ b/t/bsource.sh
diff --git a/tests/candist.test b/t/candist.sh
index 88d8854fd..88d8854fd 100755
--- a/tests/candist.test
+++ b/t/candist.sh
diff --git a/tests/canon-name.test b/t/canon-name.sh
index 3e8de0888..3e8de0888 100755
--- a/tests/canon-name.test
+++ b/t/canon-name.sh
diff --git a/tests/canon.test b/t/canon.sh
index b5038a535..b5038a535 100755
--- a/tests/canon.test
+++ b/t/canon.sh
diff --git a/tests/canon2.test b/t/canon2.sh
index 4d39a7e42..4d39a7e42 100755
--- a/tests/canon2.test
+++ b/t/canon2.sh
diff --git a/tests/canon3.test b/t/canon3.sh
index 25a8e71df..25a8e71df 100755
--- a/tests/canon3.test
+++ b/t/canon3.sh
diff --git a/tests/canon4.test b/t/canon4.sh
index 6cdfd41a7..6cdfd41a7 100755
--- a/tests/canon4.test
+++ b/t/canon4.sh
diff --git a/tests/canon5.test b/t/canon5.sh
index 0d71d8328..0d71d8328 100755
--- a/tests/canon5.test
+++ b/t/canon5.sh
diff --git a/tests/canon6.test b/t/canon6.sh
index 64f946c9e..64f946c9e 100755
--- a/tests/canon6.test
+++ b/t/canon6.sh
diff --git a/tests/canon7.test b/t/canon7.sh
index d9d22c218..d9d22c218 100755
--- a/tests/canon7.test
+++ b/t/canon7.sh
diff --git a/tests/canon8.test b/t/canon8.sh
index 180e33351..180e33351 100755
--- a/tests/canon8.test
+++ b/t/canon8.sh
diff --git a/tests/ccnoco.test b/t/ccnoco.sh
index 20d516ab1..1df950da8 100755
--- a/tests/ccnoco.test
+++ b/t/ccnoco.sh
@@ -53,7 +53,7 @@ case " \$* " in
     ;;
 esac
 
-# Use '$CC', not 'gcc', to honour the compiler chosen by 'tests/defs'.
+# Use '$CC', not 'gcc', to honour the compiler chosen by 't/defs'.
 exec $CC "\$@"
 END
 
diff --git a/tests/ccnoco2.test b/t/ccnoco2.sh
index e6c9c6428..e6c9c6428 100755
--- a/tests/ccnoco2.test
+++ b/t/ccnoco2.sh
diff --git a/tests/ccnoco3.test b/t/ccnoco3.sh
index 3b3e66d33..eb291ecd5 100755
--- a/tests/ccnoco3.test
+++ b/t/ccnoco3.sh
@@ -52,7 +52,7 @@ case " \$* " in
     ;;
 esac
 
-# Use '$CC', not 'gcc', to honour the compiler chosen by 'tests/defs'.
+# Use '$CC', not 'gcc', to honour the compiler chosen by 't/defs'.
 exec $CC "\$@"
 END
 
diff --git a/tests/check-concurrency-bug9245.test b/t/check-concurrency-bug9245.sh
index 064dce26f..064dce26f 100755
--- a/tests/check-concurrency-bug9245.test
+++ b/t/check-concurrency-bug9245.sh
diff --git a/tests/check-exported-srcdir.test b/t/check-exported-srcdir.sh
index 124269bc3..124269bc3 100755
--- a/tests/check-exported-srcdir.test
+++ b/t/check-exported-srcdir.sh
diff --git a/tests/check-fd-redirect.test b/t/check-fd-redirect.sh
index 5a64c229a..5a64c229a 100755
--- a/tests/check-fd-redirect.test
+++ b/t/check-fd-redirect.sh
diff --git a/tests/check-no-test-driver.test b/t/check-no-test-driver.sh
index cccc0ed57..cccc0ed57 100755
--- a/tests/check-no-test-driver.test
+++ b/t/check-no-test-driver.sh
diff --git a/tests/check-subst-prog.test b/t/check-subst-prog.sh
index 30e87632f..30e87632f 100755
--- a/tests/check-subst-prog.test
+++ b/t/check-subst-prog.sh
diff --git a/tests/check-subst.test b/t/check-subst.sh
index 79d7526a0..79d7526a0 100755
--- a/tests/check-subst.test
+++ b/t/check-subst.sh
diff --git a/tests/check-tests-in-builddir.test b/t/check-tests-in-builddir.sh
index 9f1fe4a6b..9f1fe4a6b 100755
--- a/tests/check-tests-in-builddir.test
+++ b/t/check-tests-in-builddir.sh
diff --git a/tests/check.test b/t/check.sh
index c9ab0fa0f..c9ab0fa0f 100755
--- a/tests/check.test
+++ b/t/check.sh
diff --git a/tests/check10.test b/t/check10.sh
index 3b3ee8bdf..3b3ee8bdf 100755
--- a/tests/check10.test
+++ b/t/check10.sh
diff --git a/tests/check11.test b/t/check11.sh
index e78da0f16..e78da0f16 100755
--- a/tests/check11.test
+++ b/t/check11.sh
diff --git a/tests/check12.test b/t/check12.sh
index a21c6daff..a21c6daff 100755
--- a/tests/check12.test
+++ b/t/check12.sh
diff --git a/tests/check2.test b/t/check2.sh
index 8a05c9cc8..8a05c9cc8 100755
--- a/tests/check2.test
+++ b/t/check2.sh
diff --git a/tests/check3.test b/t/check3.sh
index 3edfd9872..3edfd9872 100755
--- a/tests/check3.test
+++ b/t/check3.sh
diff --git a/tests/check4.test b/t/check4.sh
index 26548b3db..26548b3db 100755
--- a/tests/check4.test
+++ b/t/check4.sh
diff --git a/tests/check5.test b/t/check5.sh
index 31790f8af..31790f8af 100755
--- a/tests/check5.test
+++ b/t/check5.sh
diff --git a/tests/check6.test b/t/check6.sh
index b6f6a670b..b6f6a670b 100755
--- a/tests/check6.test
+++ b/t/check6.sh
diff --git a/tests/check7.test b/t/check7.sh
index 574569b90..574569b90 100755
--- a/tests/check7.test
+++ b/t/check7.sh
diff --git a/tests/check8.test b/t/check8.sh
index 75a4bef63..75a4bef63 100755
--- a/tests/check8.test
+++ b/t/check8.sh
diff --git a/tests/checkall.test b/t/checkall.sh
index 3b04d568a..3b04d568a 100755
--- a/tests/checkall.test
+++ b/t/checkall.sh
diff --git a/tests/clean.test b/t/clean.sh
index 279e162f3..279e162f3 100755
--- a/tests/clean.test
+++ b/t/clean.sh
diff --git a/tests/clean2.test b/t/clean2.sh
index 2599e97cb..2599e97cb 100755
--- a/tests/clean2.test
+++ b/t/clean2.sh
diff --git a/tests/colneq.test b/t/colneq.sh
index 0b5bbcd9b..0b5bbcd9b 100755
--- a/tests/colneq.test
+++ b/t/colneq.sh
diff --git a/tests/colneq2.test b/t/colneq2.sh
index b313441af..b313441af 100755
--- a/tests/colneq2.test
+++ b/t/colneq2.sh
diff --git a/tests/colneq3.test b/t/colneq3.sh
index 728cc3299..728cc3299 100755
--- a/tests/colneq3.test
+++ b/t/colneq3.sh
diff --git a/tests/colon.test b/t/colon.sh
index f5cb4e0f3..f5cb4e0f3 100755
--- a/tests/colon.test
+++ b/t/colon.sh
diff --git a/tests/colon2.test b/t/colon2.sh
index 2b06151d2..2b06151d2 100755
--- a/tests/colon2.test
+++ b/t/colon2.sh
diff --git a/tests/colon3.test b/t/colon3.sh
index 5d7b3b22b..5d7b3b22b 100755
--- a/tests/colon3.test
+++ b/t/colon3.sh
diff --git a/tests/colon4.test b/t/colon4.sh
index 6dad3ab85..6dad3ab85 100755
--- a/tests/colon4.test
+++ b/t/colon4.sh
diff --git a/tests/colon5.test b/t/colon5.sh
index 5a0ef379b..5a0ef379b 100755
--- a/tests/colon5.test
+++ b/t/colon5.sh
diff --git a/tests/colon6.test b/t/colon6.sh
index 9f14d2a09..9f14d2a09 100755
--- a/tests/colon6.test
+++ b/t/colon6.sh
diff --git a/tests/colon7.test b/t/colon7.sh
index 1b84d8046..1b84d8046 100755
--- a/tests/colon7.test
+++ b/t/colon7.sh
diff --git a/tests/color.test b/t/color.sh
index 6db445428..6db445428 100755
--- a/tests/color.test
+++ b/t/color.sh
diff --git a/tests/color2.test b/t/color2.sh
index b1c8830ee..b1c8830ee 100755
--- a/tests/color2.test
+++ b/t/color2.sh
diff --git a/tests/commen10.test b/t/commen10.sh
index d0c246abd..d0c246abd 100755
--- a/tests/commen10.test
+++ b/t/commen10.sh
diff --git a/tests/commen11.test b/t/commen11.sh
index d4b264a48..d4b264a48 100755
--- a/tests/commen11.test
+++ b/t/commen11.sh
diff --git a/tests/comment.test b/t/comment.sh
index 6ca98ba13..6ca98ba13 100755
--- a/tests/comment.test
+++ b/t/comment.sh
diff --git a/tests/comment2.test b/t/comment2.sh
index a63075c92..a63075c92 100755
--- a/tests/comment2.test
+++ b/t/comment2.sh
diff --git a/tests/comment3.test b/t/comment3.sh
index 8f80945c2..8f80945c2 100755
--- a/tests/comment3.test
+++ b/t/comment3.sh
diff --git a/tests/comment4.test b/t/comment4.sh
index 42e7bf9ad..42e7bf9ad 100755
--- a/tests/comment4.test
+++ b/t/comment4.sh
diff --git a/tests/comment5.test b/t/comment5.sh
index 0c2a4d601..0c2a4d601 100755
--- a/tests/comment5.test
+++ b/t/comment5.sh
diff --git a/tests/comment6.test b/t/comment6.sh
index 9fd8d1069..9fd8d1069 100755
--- a/tests/comment6.test
+++ b/t/comment6.sh
diff --git a/tests/comment7.test b/t/comment7.sh
index 5637fb7b6..5637fb7b6 100755
--- a/tests/comment7.test
+++ b/t/comment7.sh
diff --git a/tests/comment8.test b/t/comment8.sh
index 3ed31e7c7..3ed31e7c7 100755
--- a/tests/comment8.test
+++ b/t/comment8.sh
diff --git a/tests/comment9.test b/t/comment9.sh
index a75fafc41..a75fafc41 100755
--- a/tests/comment9.test
+++ b/t/comment9.sh
diff --git a/tests/comments-in-var-def.test b/t/comments-in-var-def.sh
index 5c01d76c1..5c01d76c1 100755
--- a/tests/comments-in-var-def.test
+++ b/t/comments-in-var-def.sh
diff --git a/tests/compile.test b/t/compile.sh
index 638a0d724..638a0d724 100755
--- a/tests/compile.test
+++ b/t/compile.sh
diff --git a/tests/compile2.test b/t/compile2.sh
index f808607bd..f808607bd 100755
--- a/tests/compile2.test
+++ b/t/compile2.sh
diff --git a/tests/compile3.test b/t/compile3.sh
index 009de7023..009de7023 100755
--- a/tests/compile3.test
+++ b/t/compile3.sh
diff --git a/tests/compile4.test b/t/compile4.sh
index bb9f6719c..bb9f6719c 100755
--- a/tests/compile4.test
+++ b/t/compile4.sh
diff --git a/tests/compile5.test b/t/compile5.sh
index 02afca3fd..02afca3fd 100755
--- a/tests/compile5.test
+++ b/t/compile5.sh
diff --git a/tests/compile6.test b/t/compile6.sh
index 9db337328..9db337328 100755
--- a/tests/compile6.test
+++ b/t/compile6.sh
diff --git a/tests/compile_f90_c_cxx.test b/t/compile_f90_c_cxx.sh
index 806c59f92..806c59f92 100755
--- a/tests/compile_f90_c_cxx.test
+++ b/t/compile_f90_c_cxx.sh
diff --git a/tests/compile_f_c_cxx.test b/t/compile_f_c_cxx.sh
index 99893d8c3..99893d8c3 100755
--- a/tests/compile_f_c_cxx.test
+++ b/t/compile_f_c_cxx.sh
diff --git a/tests/cond-basic.test b/t/cond-basic.sh
index 5d18b5c5f..5d18b5c5f 100755
--- a/tests/cond-basic.test
+++ b/t/cond-basic.sh
diff --git a/tests/cond.test b/t/cond.sh
index f7f0a8c1a..f7f0a8c1a 100755
--- a/tests/cond.test
+++ b/t/cond.sh
diff --git a/tests/cond10.test b/t/cond10.sh
index 56a9083cd..56a9083cd 100755
--- a/tests/cond10.test
+++ b/t/cond10.sh
diff --git a/tests/cond11.test b/t/cond11.sh
index b53cb70e9..b53cb70e9 100755
--- a/tests/cond11.test
+++ b/t/cond11.sh
diff --git a/tests/cond13.test b/t/cond13.sh
index 1ab328d7b..1ab328d7b 100755
--- a/tests/cond13.test
+++ b/t/cond13.sh
diff --git a/tests/cond14.test b/t/cond14.sh
index f3725c3af..f3725c3af 100755
--- a/tests/cond14.test
+++ b/t/cond14.sh
diff --git a/tests/cond15.test b/t/cond15.sh
index 68f70fd47..68f70fd47 100755
--- a/tests/cond15.test
+++ b/t/cond15.sh
diff --git a/tests/cond16.test b/t/cond16.sh
index 11a4f68d2..11a4f68d2 100755
--- a/tests/cond16.test
+++ b/t/cond16.sh
diff --git a/tests/cond17.test b/t/cond17.sh
index 37a0793ba..37a0793ba 100755
--- a/tests/cond17.test
+++ b/t/cond17.sh
diff --git a/tests/cond18.test b/t/cond18.sh
index 32c0ab2b9..32c0ab2b9 100755
--- a/tests/cond18.test
+++ b/t/cond18.sh
diff --git a/tests/cond19.test b/t/cond19.sh
index 86f677e6f..86f677e6f 100755
--- a/tests/cond19.test
+++ b/t/cond19.sh
diff --git a/tests/cond2.test b/t/cond2.sh
index 1b5fceaee..1b5fceaee 100755
--- a/tests/cond2.test
+++ b/t/cond2.sh
diff --git a/tests/cond20.test b/t/cond20.sh
index 40e41f1fe..40e41f1fe 100755
--- a/tests/cond20.test
+++ b/t/cond20.sh
diff --git a/tests/cond21.test b/t/cond21.sh
index 7719c835d..7719c835d 100755
--- a/tests/cond21.test
+++ b/t/cond21.sh
diff --git a/tests/cond22.test b/t/cond22.sh
index 7a58c2418..7a58c2418 100755
--- a/tests/cond22.test
+++ b/t/cond22.sh
diff --git a/tests/cond23.test b/t/cond23.sh
index d6c2bdfe3..d6c2bdfe3 100755
--- a/tests/cond23.test
+++ b/t/cond23.sh
diff --git a/tests/cond24.test b/t/cond24.sh
index b7038cc6b..b7038cc6b 100755
--- a/tests/cond24.test
+++ b/t/cond24.sh
diff --git a/tests/cond25.test b/t/cond25.sh
index c42703356..c42703356 100755
--- a/tests/cond25.test
+++ b/t/cond25.sh
diff --git a/tests/cond26.test b/t/cond26.sh
index f0aac9638..f0aac9638 100755
--- a/tests/cond26.test
+++ b/t/cond26.sh
diff --git a/tests/cond27.test b/t/cond27.sh
index 0a8263d01..0a8263d01 100755
--- a/tests/cond27.test
+++ b/t/cond27.sh
diff --git a/tests/cond28.test b/t/cond28.sh
index 7a6bcff84..7a6bcff84 100755
--- a/tests/cond28.test
+++ b/t/cond28.sh
diff --git a/tests/cond29.test b/t/cond29.sh
index ee9bf9b76..ee9bf9b76 100755
--- a/tests/cond29.test
+++ b/t/cond29.sh
diff --git a/tests/cond3.test b/t/cond3.sh
index 2bcb8c1db..2bcb8c1db 100755
--- a/tests/cond3.test
+++ b/t/cond3.sh
diff --git a/tests/cond30.test b/t/cond30.sh
index 6c2b39626..6c2b39626 100755
--- a/tests/cond30.test
+++ b/t/cond30.sh
diff --git a/tests/cond31.test b/t/cond31.sh
index d6006cb0d..d6006cb0d 100755
--- a/tests/cond31.test
+++ b/t/cond31.sh
diff --git a/tests/cond32.test b/t/cond32.sh
index 7ff1a4142..7ff1a4142 100755
--- a/tests/cond32.test
+++ b/t/cond32.sh
diff --git a/tests/cond33.test b/t/cond33.sh
index 9655d3b1e..9655d3b1e 100755
--- a/tests/cond33.test
+++ b/t/cond33.sh
diff --git a/tests/cond34.test b/t/cond34.sh
index 8349406a2..8349406a2 100755
--- a/tests/cond34.test
+++ b/t/cond34.sh
diff --git a/tests/cond35.test b/t/cond35.sh
index 043b3b059..043b3b059 100755
--- a/tests/cond35.test
+++ b/t/cond35.sh
diff --git a/tests/cond36.test b/t/cond36.sh
index 82200cca9..82200cca9 100755
--- a/tests/cond36.test
+++ b/t/cond36.sh
diff --git a/tests/cond37.test b/t/cond37.sh
index 6423d391b..6423d391b 100755
--- a/tests/cond37.test
+++ b/t/cond37.sh
diff --git a/tests/cond38.test b/t/cond38.sh
index 71ae69a0c..71ae69a0c 100755
--- a/tests/cond38.test
+++ b/t/cond38.sh
diff --git a/tests/cond39.test b/t/cond39.sh
index 840b8b804..840b8b804 100755
--- a/tests/cond39.test
+++ b/t/cond39.sh
diff --git a/tests/cond4.test b/t/cond4.sh
index 9bd0cc6fd..9bd0cc6fd 100755
--- a/tests/cond4.test
+++ b/t/cond4.sh
diff --git a/tests/cond40.test b/t/cond40.sh
index 7dadfc171..7dadfc171 100755
--- a/tests/cond40.test
+++ b/t/cond40.sh
diff --git a/tests/cond41.test b/t/cond41.sh
index 7c59a0a68..7c59a0a68 100755
--- a/tests/cond41.test
+++ b/t/cond41.sh
diff --git a/tests/cond42.test b/t/cond42.sh
index d4eee0104..d4eee0104 100755
--- a/tests/cond42.test
+++ b/t/cond42.sh
diff --git a/tests/cond43.test b/t/cond43.sh
index 028168ec2..028168ec2 100755
--- a/tests/cond43.test
+++ b/t/cond43.sh
diff --git a/tests/cond44.test b/t/cond44.sh
index 8cc2c2e91..8cc2c2e91 100755
--- a/tests/cond44.test
+++ b/t/cond44.sh
diff --git a/tests/cond45.test b/t/cond45.sh
index 1296cd188..1296cd188 100755
--- a/tests/cond45.test
+++ b/t/cond45.sh
diff --git a/tests/cond46.test b/t/cond46.sh
index c89caf997..c89caf997 100755
--- a/tests/cond46.test
+++ b/t/cond46.sh
diff --git a/tests/cond5.test b/t/cond5.sh
index dd45678e9..dd45678e9 100755
--- a/tests/cond5.test
+++ b/t/cond5.sh
diff --git a/tests/cond6.test b/t/cond6.sh
index f6a499d1c..f6a499d1c 100755
--- a/tests/cond6.test
+++ b/t/cond6.sh
diff --git a/tests/cond7.test b/t/cond7.sh
index 1651ac981..1651ac981 100755
--- a/tests/cond7.test
+++ b/t/cond7.sh
diff --git a/tests/cond8.test b/t/cond8.sh
index f21aacba9..f21aacba9 100755
--- a/tests/cond8.test
+++ b/t/cond8.sh
diff --git a/tests/cond9.test b/t/cond9.sh
index b9addabeb..b9addabeb 100755
--- a/tests/cond9.test
+++ b/t/cond9.sh
diff --git a/tests/condd.test b/t/condd.sh
index be32b7d1d..be32b7d1d 100755
--- a/tests/condd.test
+++ b/t/condd.sh
diff --git a/tests/condhook.test b/t/condhook.sh
index 3b0f89c2a..3b0f89c2a 100755
--- a/tests/condhook.test
+++ b/t/condhook.sh
diff --git a/tests/condhook2.test b/t/condhook2.sh
index a853e37a2..a853e37a2 100755
--- a/tests/condhook2.test
+++ b/t/condhook2.sh
diff --git a/tests/condinc.test b/t/condinc.sh
index b7011e76d..b7011e76d 100755
--- a/tests/condinc.test
+++ b/t/condinc.sh
diff --git a/tests/condinc2.test b/t/condinc2.sh
index e88b0d276..e88b0d276 100755
--- a/tests/condinc2.test
+++ b/t/condinc2.sh
diff --git a/tests/condlib.test b/t/condlib.sh
index fae04bff6..fae04bff6 100755
--- a/tests/condlib.test
+++ b/t/condlib.sh
diff --git a/tests/condman2.test b/t/condman2.sh
index fbb3844b0..fbb3844b0 100755
--- a/tests/condman2.test
+++ b/t/condman2.sh
diff --git a/tests/condman3.test b/t/condman3.sh
index 9f2714ffe..9f2714ffe 100755
--- a/tests/condman3.test
+++ b/t/condman3.sh
diff --git a/tests/confdeps.test b/t/confdeps.sh
index f508d45f2..f508d45f2 100755
--- a/tests/confdeps.test
+++ b/t/confdeps.sh
diff --git a/tests/conff.test b/t/conff.sh
index d9696608e..d9696608e 100755
--- a/tests/conff.test
+++ b/t/conff.sh
diff --git a/tests/conff2.test b/t/conff2.sh
index 2c42f29bc..2c42f29bc 100755
--- a/tests/conff2.test
+++ b/t/conff2.sh
diff --git a/tests/conffile-leading-dot.test b/t/conffile-leading-dot.sh
index 9c4cb4fff..9c4cb4fff 100755
--- a/tests/conffile-leading-dot.test
+++ b/t/conffile-leading-dot.sh
diff --git a/tests/confh.test b/t/confh.sh
index 475961998..475961998 100755
--- a/tests/confh.test
+++ b/t/confh.sh
diff --git a/tests/confh4.test b/t/confh4.sh
index ea6a9ffc2..ea6a9ffc2 100755
--- a/tests/confh4.test
+++ b/t/confh4.sh
diff --git a/tests/confh5.test b/t/confh5.sh
index c35c3e847..c35c3e847 100755
--- a/tests/confh5.test
+++ b/t/confh5.sh
diff --git a/tests/confh6.test b/t/confh6.sh
index c5e7d7e58..c5e7d7e58 100755
--- a/tests/confh6.test
+++ b/t/confh6.sh
diff --git a/tests/confh7.test b/t/confh7.sh
index 408077978..408077978 100755
--- a/tests/confh7.test
+++ b/t/confh7.sh
diff --git a/tests/confh8.test b/t/confh8.sh
index c3a27d10f..c3a27d10f 100755
--- a/tests/confh8.test
+++ b/t/confh8.sh
diff --git a/tests/configure.test b/t/configure.sh
index cedba5505..cedba5505 100755
--- a/tests/configure.test
+++ b/t/configure.sh
diff --git a/tests/confincl.test b/t/confincl.sh
index dfc755106..dfc755106 100755
--- a/tests/confincl.test
+++ b/t/confincl.sh
diff --git a/tests/conflnk.test b/t/conflnk.sh
index 93851ca8c..93851ca8c 100755
--- a/tests/conflnk.test
+++ b/t/conflnk.sh
diff --git a/tests/conflnk2.test b/t/conflnk2.sh
index 4a1478b29..4a1478b29 100755
--- a/tests/conflnk2.test
+++ b/t/conflnk2.sh
diff --git a/tests/conflnk3.test b/t/conflnk3.sh
index ffb0d98c3..ffb0d98c3 100755
--- a/tests/conflnk3.test
+++ b/t/conflnk3.sh
diff --git a/tests/conflnk4.test b/t/conflnk4.sh
index a1f2f0e5a..a1f2f0e5a 100755
--- a/tests/conflnk4.test
+++ b/t/conflnk4.sh
diff --git a/tests/confsub.test b/t/confsub.sh
index 188704678..188704678 100755
--- a/tests/confsub.test
+++ b/t/confsub.sh
diff --git a/tests/confvar.test b/t/confvar.sh
index e77563ee1..e77563ee1 100755
--- a/tests/confvar.test
+++ b/t/confvar.sh
diff --git a/tests/confvar2.test b/t/confvar2.sh
index bc6ffcae7..bc6ffcae7 100755
--- a/tests/confvar2.test
+++ b/t/confvar2.sh
diff --git a/tests/copy.test b/t/copy.sh
index a9f0f5616..a9f0f5616 100755
--- a/tests/copy.test
+++ b/t/copy.sh
diff --git a/tests/cscope.tap b/t/cscope.tap
index c39feedd7..c39feedd7 100755
--- a/tests/cscope.tap
+++ b/t/cscope.tap
diff --git a/tests/cscope2.test b/t/cscope2.sh
index f72bb6a32..f72bb6a32 100755
--- a/tests/cscope2.test
+++ b/t/cscope2.sh
diff --git a/tests/cscope3.test b/t/cscope3.sh
index 47bcd4d3a..47bcd4d3a 100755
--- a/tests/cscope3.test
+++ b/t/cscope3.sh
diff --git a/tests/cxx.test b/t/cxx.sh
index 63e55b87a..63e55b87a 100755
--- a/tests/cxx.test
+++ b/t/cxx.sh
diff --git a/tests/cxx2.test b/t/cxx2.sh
index 243e607d0..243e607d0 100755
--- a/tests/cxx2.test
+++ b/t/cxx2.sh
diff --git a/tests/cxxcpp.test b/t/cxxcpp.sh
index cc69163ca..cc69163ca 100755
--- a/tests/cxxcpp.test
+++ b/t/cxxcpp.sh
diff --git a/tests/cxxlibobj.test b/t/cxxlibobj.sh
index 6f4ce2ea1..6f4ce2ea1 100755
--- a/tests/cxxlibobj.test
+++ b/t/cxxlibobj.sh
diff --git a/tests/cxxlink.test b/t/cxxlink.sh
index 5ce3beb6f..5ce3beb6f 100755
--- a/tests/cxxlink.test
+++ b/t/cxxlink.sh
diff --git a/tests/cxxnoc.test b/t/cxxnoc.sh
index 66d0b0df2..66d0b0df2 100755
--- a/tests/cxxnoc.test
+++ b/t/cxxnoc.sh
diff --git a/tests/cxxo.test b/t/cxxo.sh
index a754701d7..a754701d7 100755
--- a/tests/cxxo.test
+++ b/t/cxxo.sh
diff --git a/tests/cygnus-check-without-all.test b/t/cygnus-check-without-all.sh
index f428e9533..f428e9533 100755
--- a/tests/cygnus-check-without-all.test
+++ b/t/cygnus-check-without-all.sh
diff --git a/tests/cygnus-dependency-tracking.test b/t/cygnus-dependency-tracking.sh
index f07c6fc51..f07c6fc51 100755
--- a/tests/cygnus-dependency-tracking.test
+++ b/t/cygnus-dependency-tracking.sh
diff --git a/tests/cygnus-imply-foreign.test b/t/cygnus-imply-foreign.sh
index 3dcf6715a..3dcf6715a 100755
--- a/tests/cygnus-imply-foreign.test
+++ b/t/cygnus-imply-foreign.sh
diff --git a/tests/cygnus-no-dist.test b/t/cygnus-no-dist.sh
index 519f0c2b8..519f0c2b8 100755
--- a/tests/cygnus-no-dist.test
+++ b/t/cygnus-no-dist.sh
diff --git a/tests/cygnus-no-installinfo.test b/t/cygnus-no-installinfo.sh
index 6f3f322ff..6f3f322ff 100755
--- a/tests/cygnus-no-installinfo.test
+++ b/t/cygnus-no-installinfo.sh
diff --git a/tests/cygnus-requires-maintainer-mode.test b/t/cygnus-requires-maintainer-mode.sh
index b01dfbcb8..b01dfbcb8 100755
--- a/tests/cygnus-requires-maintainer-mode.test
+++ b/t/cygnus-requires-maintainer-mode.sh
diff --git a/tests/cygwin32.test b/t/cygwin32.sh
index 9415fb64c..9415fb64c 100755
--- a/tests/cygwin32.test
+++ b/t/cygwin32.sh
diff --git a/tests/dash.test b/t/dash.sh
index 992bf6228..992bf6228 100755
--- a/tests/dash.test
+++ b/t/dash.sh
diff --git a/tests/defs b/t/defs
index 709101ed3..fb1370898 100644
--- a/tests/defs
+++ b/t/defs
@@ -39,12 +39,12 @@ test -f ./defs-static || {
 # Enable the errexit shell flag early.
 set -e
 
-# The name of the current test (without the '.test' suffix).
+# The name of the current test (without the '.sh' or '.tap' suffix).
 # Test scripts can override it if they need to (but this should
 # be done carefully, and *before* including ./defs).
 if test -z "$me"; then
   # Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
-  me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//;s/\.tap$//;'` \
+  me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.sh$//;s/\.tap$//;'` \
     && test -n "$me" \
     || { echo "$argv0: failed to define \$me" >&2; exit 99; }
 fi
@@ -763,7 +763,7 @@ do
       # Exuberant Ctags will create a TAGS file even
       # when asked for --help or --version.  (Emacs's etags
       # does not have such problem.)  Use -o /dev/null
-      # to make sure we do not pollute the tests/ directory.
+      # to make sure we do not pollute the build directory.
       echo "$me: running etags --version -o /dev/null"
       etags --version -o /dev/null \
         || skip_all_ "required program 'etags' not available"
diff --git a/tests/defs-static.in b/t/defs-static.in
index c1500cdb6..c1500cdb6 100644
--- a/tests/defs-static.in
+++ b/t/defs-static.in
diff --git a/tests/defun.test b/t/defun.sh
index 9b66a56f3..9b66a56f3 100755
--- a/tests/defun.test
+++ b/t/defun.sh
diff --git a/tests/defun2.test b/t/defun2.sh
index 0b3f96b6d..0b3f96b6d 100755
--- a/tests/defun2.test
+++ b/t/defun2.sh
diff --git a/tests/dejagnu-absolute-builddir.test b/t/dejagnu-absolute-builddir.sh
index 8cdc3a1d7..8cdc3a1d7 100755
--- a/tests/dejagnu-absolute-builddir.test
+++ b/t/dejagnu-absolute-builddir.sh
diff --git a/tests/dejagnu-relative-srcdir.test b/t/dejagnu-relative-srcdir.sh
index 05ae2005e..05ae2005e 100755
--- a/tests/dejagnu-relative-srcdir.test
+++ b/t/dejagnu-relative-srcdir.sh
diff --git a/tests/dejagnu-siteexp-append.test b/t/dejagnu-siteexp-append.sh
index c3bfff6af..c3bfff6af 100755
--- a/tests/dejagnu-siteexp-append.test
+++ b/t/dejagnu-siteexp-append.sh
diff --git a/tests/dejagnu-siteexp-extend.test b/t/dejagnu-siteexp-extend.sh
index f0f61942a..f0f61942a 100755
--- a/tests/dejagnu-siteexp-extend.test
+++ b/t/dejagnu-siteexp-extend.sh
diff --git a/tests/dejagnu-siteexp-useredit.test b/t/dejagnu-siteexp-useredit.sh
index 9be5eba90..9be5eba90 100755
--- a/tests/dejagnu-siteexp-useredit.test
+++ b/t/dejagnu-siteexp-useredit.sh
diff --git a/tests/dejagnu.test b/t/dejagnu.sh
index 14b118c8a..14b118c8a 100755
--- a/tests/dejagnu.test
+++ b/t/dejagnu.sh
diff --git a/tests/dejagnu2.test b/t/dejagnu2.sh
index 0a0d0910f..0a0d0910f 100755
--- a/tests/dejagnu2.test
+++ b/t/dejagnu2.sh
diff --git a/tests/dejagnu3.test b/t/dejagnu3.sh
index 7d15bc941..7d15bc941 100755
--- a/tests/dejagnu3.test
+++ b/t/dejagnu3.sh
diff --git a/tests/dejagnu4.test b/t/dejagnu4.sh
index 44904dfbf..44904dfbf 100755
--- a/tests/dejagnu4.test
+++ b/t/dejagnu4.sh
diff --git a/tests/dejagnu5.test b/t/dejagnu5.sh
index 26eaa6096..26eaa6096 100755
--- a/tests/dejagnu5.test
+++ b/t/dejagnu5.sh
diff --git a/tests/dejagnu6.test b/t/dejagnu6.sh
index 38255f6f8..38255f6f8 100755
--- a/tests/dejagnu6.test
+++ b/t/dejagnu6.sh
diff --git a/tests/dejagnu7.test b/t/dejagnu7.sh
index a926955f6..a926955f6 100755
--- a/tests/dejagnu7.test
+++ b/t/dejagnu7.sh
diff --git a/tests/deleted-am.test b/t/deleted-am.sh
index 636286cf9..636286cf9 100755
--- a/tests/deleted-am.test
+++ b/t/deleted-am.sh
diff --git a/tests/deleted-m4.test b/t/deleted-m4.sh
index e1bbfce4a..e1bbfce4a 100755
--- a/tests/deleted-m4.test
+++ b/t/deleted-m4.sh
diff --git a/tests/depacl2.test b/t/depacl2.sh
index 378a1a2a2..378a1a2a2 100755
--- a/tests/depacl2.test
+++ b/t/depacl2.sh
diff --git a/tests/depcomp.test b/t/depcomp.sh
index f2e0370e5..f2e0370e5 100755
--- a/tests/depcomp.test
+++ b/t/depcomp.sh
diff --git a/tests/depcomp2.test b/t/depcomp2.sh
index 624dee6f0..624dee6f0 100755
--- a/tests/depcomp2.test
+++ b/t/depcomp2.sh
diff --git a/tests/depcomp8a.test b/t/depcomp8a.sh
index 01a2403c2..01a2403c2 100755
--- a/tests/depcomp8a.test
+++ b/t/depcomp8a.sh
diff --git a/tests/depcomp8b.test b/t/depcomp8b.sh
index b5f7371cd..b5f7371cd 100755
--- a/tests/depcomp8b.test
+++ b/t/depcomp8b.sh
diff --git a/tests/depdist.test b/t/depdist.sh
index e81e09783..e81e09783 100755
--- a/tests/depdist.test
+++ b/t/depdist.sh
diff --git a/tests/depend.test b/t/depend.sh
index a2e3bd866..a2e3bd866 100755
--- a/tests/depend.test
+++ b/t/depend.sh
diff --git a/tests/depend3.test b/t/depend3.sh
index 8f8431afa..8f8431afa 100755
--- a/tests/depend3.test
+++ b/t/depend3.sh
diff --git a/tests/depend4.test b/t/depend4.sh
index d9896f860..d9896f860 100755
--- a/tests/depend4.test
+++ b/t/depend4.sh
diff --git a/tests/depend5.test b/t/depend5.sh
index ca900f0fc..ca900f0fc 100755
--- a/tests/depend5.test
+++ b/t/depend5.sh
diff --git a/tests/depend6.test b/t/depend6.sh
index fb4c14003..fb4c14003 100755
--- a/tests/depend6.test
+++ b/t/depend6.sh
diff --git a/tests/deprecated-acinit.test b/t/deprecated-acinit.sh
index d130f9c44..d130f9c44 100755
--- a/tests/deprecated-acinit.test
+++ b/t/deprecated-acinit.sh
diff --git a/tests/destdir.test b/t/destdir.sh
index 22bf18406..22bf18406 100755
--- a/tests/destdir.test
+++ b/t/destdir.sh
diff --git a/tests/dirlist-abspath.test b/t/dirlist-abspath.sh
index 78af8b1f2..78af8b1f2 100755
--- a/tests/dirlist-abspath.test
+++ b/t/dirlist-abspath.sh
diff --git a/tests/dirlist.test b/t/dirlist.sh
index 76daa3505..76daa3505 100755
--- a/tests/dirlist.test
+++ b/t/dirlist.sh
diff --git a/tests/dirlist2.test b/t/dirlist2.sh
index f3b9c4ddc..f3b9c4ddc 100755
--- a/tests/dirlist2.test
+++ b/t/dirlist2.sh
diff --git a/tests/discover.test b/t/discover.sh
index 7a01dc74d..7a01dc74d 100755
--- a/tests/discover.test
+++ b/t/discover.sh
diff --git a/tests/dist-auxdir-many-subdirs.test b/t/dist-auxdir-many-subdirs.sh
index db9aa9407..db9aa9407 100755
--- a/tests/dist-auxdir-many-subdirs.test
+++ b/t/dist-auxdir-many-subdirs.sh
diff --git a/tests/dist-auxfile-2.test b/t/dist-auxfile-2.sh
index b7e2e2d1a..b7e2e2d1a 100755
--- a/tests/dist-auxfile-2.test
+++ b/t/dist-auxfile-2.sh
diff --git a/tests/dist-auxfile.test b/t/dist-auxfile.sh
index 9f7e8eee7..9f7e8eee7 100755
--- a/tests/dist-auxfile.test
+++ b/t/dist-auxfile.sh
diff --git a/tests/dist-formats.tap b/t/dist-formats.tap
index 8a287ff9d..8a287ff9d 100755
--- a/tests/dist-formats.tap
+++ b/t/dist-formats.tap
diff --git a/tests/dist-included-parent-dir.test b/t/dist-included-parent-dir.sh
index ae135aee4..ae135aee4 100755
--- a/tests/dist-included-parent-dir.test
+++ b/t/dist-included-parent-dir.sh
diff --git a/tests/dist-missing-am.test b/t/dist-missing-am.sh
index 0765b0c59..0765b0c59 100755
--- a/tests/dist-missing-am.test
+++ b/t/dist-missing-am.sh
diff --git a/tests/dist-missing-included-m4.test b/t/dist-missing-included-m4.sh
index 59600036c..59600036c 100755
--- a/tests/dist-missing-included-m4.test
+++ b/t/dist-missing-included-m4.sh
diff --git a/tests/dist-missing-m4.test b/t/dist-missing-m4.sh
index 9a418d316..9a418d316 100755
--- a/tests/dist-missing-m4.test
+++ b/t/dist-missing-m4.sh
diff --git a/tests/dist-pr109765.test b/t/dist-pr109765.sh
index 2e22e841d..2e22e841d 100755
--- a/tests/dist-pr109765.test
+++ b/t/dist-pr109765.sh
diff --git a/tests/dist-readonly.test b/t/dist-readonly.sh
index 1aa32c804..1aa32c804 100755
--- a/tests/dist-readonly.test
+++ b/t/dist-readonly.sh
diff --git a/tests/dist-repeated.test b/t/dist-repeated.sh
index 6651e72c9..6651e72c9 100755
--- a/tests/dist-repeated.test
+++ b/t/dist-repeated.sh
diff --git a/tests/distcheck-configure-flags-am.test b/t/distcheck-configure-flags-am.sh
index 7dbe2ab3d..7dbe2ab3d 100755
--- a/tests/distcheck-configure-flags-am.test
+++ b/t/distcheck-configure-flags-am.sh
diff --git a/tests/distcheck-configure-flags-subpkg.test b/t/distcheck-configure-flags-subpkg.sh
index 45d0e0cb6..45d0e0cb6 100755
--- a/tests/distcheck-configure-flags-subpkg.test
+++ b/t/distcheck-configure-flags-subpkg.sh
diff --git a/tests/distcheck-configure-flags.test b/t/distcheck-configure-flags.sh
index ae9fe4015..ae9fe4015 100755
--- a/tests/distcheck-configure-flags.test
+++ b/t/distcheck-configure-flags.sh
diff --git a/tests/distcheck-hook.test b/t/distcheck-hook.sh
index dfc20010a..dfc20010a 100755
--- a/tests/distcheck-hook.test
+++ b/t/distcheck-hook.sh
diff --git a/tests/distcheck-hook2.test b/t/distcheck-hook2.sh
index 93446b3bc..93446b3bc 100755
--- a/tests/distcheck-hook2.test
+++ b/t/distcheck-hook2.sh
diff --git a/tests/distcheck-missing-m4.test b/t/distcheck-missing-m4.sh
index e583be12f..e583be12f 100755
--- a/tests/distcheck-missing-m4.test
+++ b/t/distcheck-missing-m4.sh
diff --git a/tests/distcheck-outdated-m4.test b/t/distcheck-outdated-m4.sh
index 71ae3dd21..71ae3dd21 100755
--- a/tests/distcheck-outdated-m4.test
+++ b/t/distcheck-outdated-m4.sh
diff --git a/tests/distcheck-override-infodir.test b/t/distcheck-override-infodir.sh
index 746b5f859..746b5f859 100755
--- a/tests/distcheck-override-infodir.test
+++ b/t/distcheck-override-infodir.sh
diff --git a/tests/distcheck-pr10470.test b/t/distcheck-pr10470.sh
index 1b6a3226a..1b6a3226a 100755
--- a/tests/distcheck-pr10470.test
+++ b/t/distcheck-pr10470.sh
diff --git a/tests/distcheck-pr9579.test b/t/distcheck-pr9579.sh
index 8c789001e..8c789001e 100755
--- a/tests/distcheck-pr9579.test
+++ b/t/distcheck-pr9579.sh
diff --git a/tests/distcheck-writable-srcdir.test b/t/distcheck-writable-srcdir.sh
index bbc50f461..bbc50f461 100755
--- a/tests/distcheck-writable-srcdir.test
+++ b/t/distcheck-writable-srcdir.sh
diff --git a/tests/distcleancheck.test b/t/distcleancheck.sh
index 39197d721..39197d721 100755
--- a/tests/distcleancheck.test
+++ b/t/distcleancheck.sh
diff --git a/tests/distcom-subdir.test b/t/distcom-subdir.sh
index 4da74d05c..4da74d05c 100755
--- a/tests/distcom-subdir.test
+++ b/t/distcom-subdir.sh
diff --git a/tests/distcom2.test b/t/distcom2.sh
index 4b86f928d..4b86f928d 100755
--- a/tests/distcom2.test
+++ b/t/distcom2.sh
diff --git a/tests/distcom3.test b/t/distcom3.sh
index 34ad7096e..34ad7096e 100755
--- a/tests/distcom3.test
+++ b/t/distcom3.sh
diff --git a/tests/distcom4.test b/t/distcom4.sh
index dc37fcf4f..dc37fcf4f 100755
--- a/tests/distcom4.test
+++ b/t/distcom4.sh
diff --git a/tests/distcom5.test b/t/distcom5.sh
index adfbe52d1..adfbe52d1 100755
--- a/tests/distcom5.test
+++ b/t/distcom5.sh
diff --git a/tests/distdir.test b/t/distdir.sh
index 0657928dc..0657928dc 100755
--- a/tests/distdir.test
+++ b/t/distdir.sh
diff --git a/tests/disthook.test b/t/disthook.sh
index 9804e9942..9804e9942 100755
--- a/tests/disthook.test
+++ b/t/disthook.sh
diff --git a/tests/distlinks.test b/t/distlinks.sh
index 08244c06e..08244c06e 100755
--- a/tests/distlinks.test
+++ b/t/distlinks.sh
diff --git a/tests/distlinksbrk.test b/t/distlinksbrk.sh
index b7732ca63..b7732ca63 100755
--- a/tests/distlinksbrk.test
+++ b/t/distlinksbrk.sh
diff --git a/tests/distname.test b/t/distname.sh
index 0ef3cdb4c..0ef3cdb4c 100755
--- a/tests/distname.test
+++ b/t/distname.sh
diff --git a/tests/dmalloc.test b/t/dmalloc.sh
index 2bf6a7c49..2bf6a7c49 100755
--- a/tests/dmalloc.test
+++ b/t/dmalloc.sh
diff --git a/tests/doc-parsing-buglets-colneq-subst.test b/t/doc-parsing-buglets-colneq-subst.sh
index 8ff27f1e7..8ff27f1e7 100755
--- a/tests/doc-parsing-buglets-colneq-subst.test
+++ b/t/doc-parsing-buglets-colneq-subst.sh
diff --git a/tests/doc-parsing-buglets-tabs.test b/t/doc-parsing-buglets-tabs.sh
index 22c981c63..22c981c63 100755
--- a/tests/doc-parsing-buglets-tabs.test
+++ b/t/doc-parsing-buglets-tabs.sh
diff --git a/tests/dollar.test b/t/dollar.sh
index 92ed26a94..92ed26a94 100755
--- a/tests/dollar.test
+++ b/t/dollar.sh
diff --git a/tests/dollarvar.test b/t/dollarvar.sh
index 940ef23db..940ef23db 100755
--- a/tests/dollarvar.test
+++ b/t/dollarvar.sh
diff --git a/tests/dollarvar2.test b/t/dollarvar2.sh
index cef85bb96..cef85bb96 100755
--- a/tests/dollarvar2.test
+++ b/t/dollarvar2.sh
diff --git a/tests/double.test b/t/double.sh
index 7f353b799..7f353b799 100755
--- a/tests/double.test
+++ b/t/double.sh
diff --git a/tests/dup2.test b/t/dup2.sh
index d40582839..d40582839 100755
--- a/tests/dup2.test
+++ b/t/dup2.sh
diff --git a/tests/else.test b/t/else.sh
index 74d21586b..74d21586b 100755
--- a/tests/else.test
+++ b/t/else.sh
diff --git a/tests/empty.test b/t/empty.sh
index 795f92226..795f92226 100755
--- a/tests/empty.test
+++ b/t/empty.sh
diff --git a/tests/empty2.test b/t/empty2.sh
index 7d1242301..7d1242301 100755
--- a/tests/empty2.test
+++ b/t/empty2.sh
diff --git a/tests/empty3.test b/t/empty3.sh
index 6aabfbaa9..6aabfbaa9 100755
--- a/tests/empty3.test
+++ b/t/empty3.sh
diff --git a/tests/empty4.test b/t/empty4.sh
index 810642607..810642607 100755
--- a/tests/empty4.test
+++ b/t/empty4.sh
diff --git a/tests/exdir.test b/t/exdir.sh
index 6e048d23f..6e048d23f 100755
--- a/tests/exdir.test
+++ b/t/exdir.sh
diff --git a/tests/exdir2.test b/t/exdir2.sh
index ddaac5830..ddaac5830 100755
--- a/tests/exdir2.test
+++ b/t/exdir2.sh
diff --git a/tests/exdir3.test b/t/exdir3.sh
index 672548c44..672548c44 100755
--- a/tests/exdir3.test
+++ b/t/exdir3.sh
diff --git a/tests/exeext.test b/t/exeext.sh
index 42fa57497..42fa57497 100755
--- a/tests/exeext.test
+++ b/t/exeext.sh
diff --git a/tests/exeext2.test b/t/exeext2.sh
index 3315ad8db..3315ad8db 100755
--- a/tests/exeext2.test
+++ b/t/exeext2.sh
diff --git a/tests/exeext3.test b/t/exeext3.sh
index 1bc1a1022..1bc1a1022 100755
--- a/tests/exeext3.test
+++ b/t/exeext3.sh
diff --git a/tests/exeext4.test b/t/exeext4.sh
index 298879dee..298879dee 100755
--- a/tests/exeext4.test
+++ b/t/exeext4.sh
diff --git a/tests/exsource.test b/t/exsource.sh
index 15b274f07..15b274f07 100755
--- a/tests/exsource.test
+++ b/t/exsource.sh
diff --git a/tests/ext.test b/t/ext.sh
index dd92e8555..dd92e8555 100755
--- a/tests/ext.test
+++ b/t/ext.sh
diff --git a/tests/ext2.test b/t/ext2.sh
index 3df028208..3df028208 100755
--- a/tests/ext2.test
+++ b/t/ext2.sh
diff --git a/tests/ext3.test b/t/ext3.sh
index bd5ed6dd3..bd5ed6dd3 100755
--- a/tests/ext3.test
+++ b/t/ext3.sh
diff --git a/tests/extra-portability.test b/t/extra-portability.sh
index 3ad637592..3ad637592 100755
--- a/tests/extra-portability.test
+++ b/t/extra-portability.sh
diff --git a/tests/extra-portability2.test b/t/extra-portability2.sh
index 2d33008c5..2d33008c5 100755
--- a/tests/extra-portability2.test
+++ b/t/extra-portability2.sh
diff --git a/tests/extra-portability3.test b/t/extra-portability3.sh
index 13d608469..13d608469 100755
--- a/tests/extra-portability3.test
+++ b/t/extra-portability3.sh
diff --git a/tests/extra-programs-empty.test b/t/extra-programs-empty.sh
index 37e1a2bc1..37e1a2bc1 100755
--- a/tests/extra-programs-empty.test
+++ b/t/extra-programs-empty.sh
diff --git a/tests/extra.test b/t/extra.sh
index 7bad9ef0a..7bad9ef0a 100755
--- a/tests/extra.test
+++ b/t/extra.sh
diff --git a/tests/extra10.test b/t/extra10.sh
index 8fe7133d2..8fe7133d2 100755
--- a/tests/extra10.test
+++ b/t/extra10.sh
diff --git a/tests/extra11.test b/t/extra11.sh
index a645afbe4..a645afbe4 100755
--- a/tests/extra11.test
+++ b/t/extra11.sh
diff --git a/tests/extra12.test b/t/extra12.sh
index 979411592..979411592 100755
--- a/tests/extra12.test
+++ b/t/extra12.sh
diff --git a/tests/extra2.test b/t/extra2.sh
index 30eaeeda6..30eaeeda6 100755
--- a/tests/extra2.test
+++ b/t/extra2.sh
diff --git a/tests/extra3.test b/t/extra3.sh
index 406580106..406580106 100755
--- a/tests/extra3.test
+++ b/t/extra3.sh
diff --git a/tests/extra4.test b/t/extra4.sh
index 5b31b63ac..5b31b63ac 100755
--- a/tests/extra4.test
+++ b/t/extra4.sh
diff --git a/tests/extra5.test b/t/extra5.sh
index 7fdd9838d..7fdd9838d 100755
--- a/tests/extra5.test
+++ b/t/extra5.sh
diff --git a/tests/extra6.test b/t/extra6.sh
index 6b512114b..6b512114b 100755
--- a/tests/extra6.test
+++ b/t/extra6.sh
diff --git a/tests/extra7.test b/t/extra7.sh
index 4ad778959..4ad778959 100755
--- a/tests/extra7.test
+++ b/t/extra7.sh
diff --git a/tests/extra8.test b/t/extra8.sh
index 9eef189d1..9eef189d1 100755
--- a/tests/extra8.test
+++ b/t/extra8.sh
diff --git a/tests/extra9.test b/t/extra9.sh
index b5a6007c1..b5a6007c1 100755
--- a/tests/extra9.test
+++ b/t/extra9.sh
diff --git a/tests/extradep.test b/t/extradep.sh
index 77b806a97..77b806a97 100755
--- a/tests/extradep.test
+++ b/t/extradep.sh
diff --git a/tests/extradep2.test b/t/extradep2.sh
index 91722bd0a..91722bd0a 100755
--- a/tests/extradep2.test
+++ b/t/extradep2.sh
diff --git a/tests/f90only.test b/t/f90only.sh
index a65a91ecf..a65a91ecf 100755
--- a/tests/f90only.test
+++ b/t/f90only.sh
diff --git a/tests/flavor.test b/t/flavor.sh
index f53240690..f53240690 100755
--- a/tests/flavor.test
+++ b/t/flavor.sh
diff --git a/tests/flibs.test b/t/flibs.sh
index 4f5701bd0..4f5701bd0 100755
--- a/tests/flibs.test
+++ b/t/flibs.sh
diff --git a/tests/fn99.test b/t/fn99.sh
index 900b36bd3..900b36bd3 100755
--- a/tests/fn99.test
+++ b/t/fn99.sh
diff --git a/tests/fn99subdir.test b/t/fn99subdir.sh
index beb02618f..beb02618f 100755
--- a/tests/fn99subdir.test
+++ b/t/fn99subdir.sh
diff --git a/tests/fnoc.test b/t/fnoc.sh
index fbd21352f..fbd21352f 100755
--- a/tests/fnoc.test
+++ b/t/fnoc.sh
diff --git a/tests/fo.test b/t/fo.sh
index 50b4f4a12..50b4f4a12 100755
--- a/tests/fo.test
+++ b/t/fo.sh
diff --git a/tests/fonly.test b/t/fonly.sh
index c3ae61481..c3ae61481 100755
--- a/tests/fonly.test
+++ b/t/fonly.sh
diff --git a/tests/forcemiss.test b/t/forcemiss.sh
index d7d0800c2..d7d0800c2 100755
--- a/tests/forcemiss.test
+++ b/t/forcemiss.sh
diff --git a/tests/forcemiss2.test b/t/forcemiss2.sh
index 3c75722df..3c75722df 100755
--- a/tests/forcemiss2.test
+++ b/t/forcemiss2.sh
diff --git a/tests/fort1.test b/t/fort1.sh
index 6bf58fef9..6bf58fef9 100755
--- a/tests/fort1.test
+++ b/t/fort1.sh
diff --git a/tests/fort2.test b/t/fort2.sh
index d345592ef..d345592ef 100755
--- a/tests/fort2.test
+++ b/t/fort2.sh
diff --git a/tests/fort4.test b/t/fort4.sh
index a23c9bda5..a23c9bda5 100755
--- a/tests/fort4.test
+++ b/t/fort4.sh
diff --git a/tests/fort5.test b/t/fort5.sh
index 4614b661d..4614b661d 100755
--- a/tests/fort5.test
+++ b/t/fort5.sh
diff --git a/tests/fortdep.test b/t/fortdep.sh
index d10644d88..d10644d88 100755
--- a/tests/fortdep.test
+++ b/t/fortdep.sh
diff --git a/tests/gcj.test b/t/gcj.sh
index b510f1c76..b510f1c76 100755
--- a/tests/gcj.test
+++ b/t/gcj.sh
diff --git a/tests/gcj2.test b/t/gcj2.sh
index 2c4d60f33..2c4d60f33 100755
--- a/tests/gcj2.test
+++ b/t/gcj2.sh
diff --git a/tests/gcj3.test b/t/gcj3.sh
index a8ec120b6..a8ec120b6 100755
--- a/tests/gcj3.test
+++ b/t/gcj3.sh
diff --git a/tests/gcj4.test b/t/gcj4.sh
index a860f89e2..a860f89e2 100755
--- a/tests/gcj4.test
+++ b/t/gcj4.sh
diff --git a/tests/gcj5.test b/t/gcj5.sh
index f3c218f30..f3c218f30 100755
--- a/tests/gcj5.test
+++ b/t/gcj5.sh
diff --git a/tests/gcj6.test b/t/gcj6.sh
index 3fe4a31f6..3fe4a31f6 100755
--- a/tests/gcj6.test
+++ b/t/gcj6.sh
diff --git a/tests/gen-testsuite-part b/t/gen-testsuite-part
index 719dc17d2..f97810645 100755
--- a/tests/gen-testsuite-part
+++ b/t/gen-testsuite-part
@@ -138,7 +138,7 @@ sub parse_options (@)
 #--------------------------------------------------------------------------
 
 # Where testsuite-related helper scripts, data files and shell libraries
-# are placed.  Relative to the 'tests/' subdirectory.
+# are placed.  Relative to the 't/' subdirectory.
 my $auxdir = "ax";
 
 my %deps_extractor =
diff --git a/tests/get-sysconf.test b/t/get-sysconf.sh
index ae3310e5d..ae3310e5d 100755
--- a/tests/get-sysconf.test
+++ b/t/get-sysconf.sh
diff --git a/tests/gettext-macros.test b/t/gettext-macros.sh
index 38749d36c..38749d36c 100755
--- a/tests/gettext-macros.test
+++ b/t/gettext-macros.sh
diff --git a/tests/gettext.test b/t/gettext.sh
index a9181e48d..a9181e48d 100755
--- a/tests/gettext.test
+++ b/t/gettext.sh
diff --git a/tests/gettext2.test b/t/gettext2.sh
index 8b8a06284..8b8a06284 100755
--- a/tests/gettext2.test
+++ b/t/gettext2.sh
diff --git a/tests/gettext3.test b/t/gettext3.sh
index 9a39af2ae..9a39af2ae 100755
--- a/tests/gettext3.test
+++ b/t/gettext3.sh
diff --git a/tests/gnits.test b/t/gnits.sh
index badb8b0c3..badb8b0c3 100755
--- a/tests/gnits.test
+++ b/t/gnits.sh
diff --git a/tests/gnits2.test b/t/gnits2.sh
index ef7078cc2..ef7078cc2 100755
--- a/tests/gnits2.test
+++ b/t/gnits2.sh
diff --git a/tests/gnits3.test b/t/gnits3.sh
index f4797629d..f4797629d 100755
--- a/tests/gnits3.test
+++ b/t/gnits3.sh
diff --git a/tests/gnumake.test b/t/gnumake.sh
index b1ea0002f..b1ea0002f 100755
--- a/tests/gnumake.test
+++ b/t/gnumake.sh
diff --git a/tests/gnuwarn.test b/t/gnuwarn.sh
index 5aac432b7..5aac432b7 100755
--- a/tests/gnuwarn.test
+++ b/t/gnuwarn.sh
diff --git a/tests/gnuwarn2.test b/t/gnuwarn2.sh
index 6a68d6580..6a68d6580 100755
--- a/tests/gnuwarn2.test
+++ b/t/gnuwarn2.sh
diff --git a/tests/hdr-vars-defined-once.test b/t/hdr-vars-defined-once.sh
index 1e31cd201..1e31cd201 100755
--- a/tests/hdr-vars-defined-once.test
+++ b/t/hdr-vars-defined-once.sh
diff --git a/tests/header.test b/t/header.sh
index dc93ac87a..dc93ac87a 100755
--- a/tests/header.test
+++ b/t/header.sh
diff --git a/tests/help-depend.test b/t/help-depend.sh
index c69d564d8..c69d564d8 100755
--- a/tests/help-depend.test
+++ b/t/help-depend.sh
diff --git a/tests/help-depend2.test b/t/help-depend2.sh
index 58a8342a8..58a8342a8 100755
--- a/tests/help-depend2.test
+++ b/t/help-depend2.sh
diff --git a/tests/help-dmalloc.test b/t/help-dmalloc.sh
index a9ab69f60..a9ab69f60 100755
--- a/tests/help-dmalloc.test
+++ b/t/help-dmalloc.sh
diff --git a/tests/help-init.test b/t/help-init.sh
index d1cff1cd0..d1cff1cd0 100755
--- a/tests/help-init.test
+++ b/t/help-init.sh
diff --git a/tests/help-lispdir.test b/t/help-lispdir.sh
index ca1ddfc30..ca1ddfc30 100755
--- a/tests/help-lispdir.test
+++ b/t/help-lispdir.sh
diff --git a/tests/help-multilib.test b/t/help-multilib.sh
index 3fb455fc8..3fb455fc8 100755
--- a/tests/help-multilib.test
+++ b/t/help-multilib.sh
diff --git a/tests/help-python.test b/t/help-python.sh
index 501b545d8..501b545d8 100755
--- a/tests/help-python.test
+++ b/t/help-python.sh
diff --git a/tests/help-silent.test b/t/help-silent.sh
index d5fc34225..d5fc34225 100755
--- a/tests/help-silent.test
+++ b/t/help-silent.sh
diff --git a/tests/help-upc.test b/t/help-upc.sh
index b81b3879a..b81b3879a 100755
--- a/tests/help-upc.test
+++ b/t/help-upc.sh
diff --git a/tests/help.test b/t/help.sh
index 2f7c2d1ba..2f7c2d1ba 100755
--- a/tests/help.test
+++ b/t/help.sh
diff --git a/tests/help2.test b/t/help2.sh
index 0d433f462..0d433f462 100755
--- a/tests/help2.test
+++ b/t/help2.sh
diff --git a/tests/help3.test b/t/help3.sh
index 54e06d57c..54e06d57c 100755
--- a/tests/help3.test
+++ b/t/help3.sh
diff --git a/tests/help4.test b/t/help4.sh
index 9747968b1..9747968b1 100755
--- a/tests/help4.test
+++ b/t/help4.sh
diff --git a/tests/hfs.test b/t/hfs.sh
index 60000406f..60000406f 100755
--- a/tests/hfs.test
+++ b/t/hfs.sh
diff --git a/tests/implicit.test b/t/implicit.sh
index a9a068b9b..a9a068b9b 100755
--- a/tests/implicit.test
+++ b/t/implicit.sh
diff --git a/tests/info.test b/t/info.sh
index 738ddfd1c..738ddfd1c 100755
--- a/tests/info.test
+++ b/t/info.sh
diff --git a/tests/init.test b/t/init.sh
index d57681489..d57681489 100755
--- a/tests/init.test
+++ b/t/init.sh
diff --git a/tests/init2.test b/t/init2.sh
index 44e79cb9c..44e79cb9c 100755
--- a/tests/init2.test
+++ b/t/init2.sh
diff --git a/tests/insh2.test b/t/insh2.sh
index cd74f82a5..cd74f82a5 100755
--- a/tests/insh2.test
+++ b/t/insh2.sh
diff --git a/tests/install-info-dir.test b/t/install-info-dir.sh
index c76f424ad..c76f424ad 100755
--- a/tests/install-info-dir.test
+++ b/t/install-info-dir.sh
diff --git a/tests/install2.test b/t/install2.sh
index f1992e8b1..f1992e8b1 100755
--- a/tests/install2.test
+++ b/t/install2.sh
diff --git a/tests/installdir.test b/t/installdir.sh
index dc83ee36d..dc83ee36d 100755
--- a/tests/installdir.test
+++ b/t/installdir.sh
diff --git a/tests/instdat.test b/t/instdat.sh
index 0754a0941..0754a0941 100755
--- a/tests/instdat.test
+++ b/t/instdat.sh
diff --git a/tests/instdat2.test b/t/instdat2.sh
index 8773fc369..8773fc369 100755
--- a/tests/instdat2.test
+++ b/t/instdat2.sh
diff --git a/tests/instdir-cond.test b/t/instdir-cond.sh
index 2965ff19d..2965ff19d 100644
--- a/tests/instdir-cond.test
+++ b/t/instdir-cond.sh
diff --git a/tests/instdir-cond2.test b/t/instdir-cond2.sh
index 1fc24b70d..1fc24b70d 100644
--- a/tests/instdir-cond2.test
+++ b/t/instdir-cond2.sh
diff --git a/tests/instdir-java.test b/t/instdir-java.sh
index 4d47d19a8..4d47d19a8 100755
--- a/tests/instdir-java.test
+++ b/t/instdir-java.sh
diff --git a/tests/instdir-lisp.test b/t/instdir-lisp.sh
index f019504d2..f019504d2 100755
--- a/tests/instdir-lisp.test
+++ b/t/instdir-lisp.sh
diff --git a/tests/instdir-ltlib.test b/t/instdir-ltlib.sh
index ded16cd5b..ded16cd5b 100755
--- a/tests/instdir-ltlib.test
+++ b/t/instdir-ltlib.sh
diff --git a/tests/instdir-no-empty.test b/t/instdir-no-empty.sh
index 6f105c025..6f105c025 100755
--- a/tests/instdir-no-empty.test
+++ b/t/instdir-no-empty.sh
diff --git a/tests/instdir-prog.test b/t/instdir-prog.sh
index e0948c088..e0948c088 100755
--- a/tests/instdir-prog.test
+++ b/t/instdir-prog.sh
diff --git a/tests/instdir-python.test b/t/instdir-python.sh
index f48353deb..f48353deb 100755
--- a/tests/instdir-python.test
+++ b/t/instdir-python.sh
diff --git a/tests/instdir-texi.test b/t/instdir-texi.sh
index 4e4887a7a..4e4887a7a 100755
--- a/tests/instdir-texi.test
+++ b/t/instdir-texi.sh
diff --git a/tests/instdir.test b/t/instdir.sh
index f09fdfa7c..f09fdfa7c 100755
--- a/tests/instdir.test
+++ b/t/instdir.sh
diff --git a/tests/instdir2.test b/t/instdir2.sh
index bdfa80999..bdfa80999 100755
--- a/tests/instdir2.test
+++ b/t/instdir2.sh
diff --git a/tests/instexec.test b/t/instexec.sh
index c033ecd37..c033ecd37 100755
--- a/tests/instexec.test
+++ b/t/instexec.sh
diff --git a/tests/instfail-info.test b/t/instfail-info.sh
index 58aef975c..58aef975c 100755
--- a/tests/instfail-info.test
+++ b/t/instfail-info.sh
diff --git a/tests/instfail-java.test b/t/instfail-java.sh
index 0ae80f58e..0ae80f58e 100755
--- a/tests/instfail-java.test
+++ b/t/instfail-java.sh
diff --git a/tests/instfail-libtool.test b/t/instfail-libtool.sh
index 0acfd2c5a..0acfd2c5a 100755
--- a/tests/instfail-libtool.test
+++ b/t/instfail-libtool.sh
diff --git a/tests/instfail.test b/t/instfail.sh
index 1e5a340f7..1e5a340f7 100755
--- a/tests/instfail.test
+++ b/t/instfail.sh
diff --git a/tests/insthook.test b/t/insthook.sh
index 23bc4e03e..23bc4e03e 100755
--- a/tests/insthook.test
+++ b/t/insthook.sh
diff --git a/tests/instman.test b/t/instman.sh
index 787104592..787104592 100755
--- a/tests/instman.test
+++ b/t/instman.sh
diff --git a/tests/instman2.test b/t/instman2.sh
index 04663dbef..04663dbef 100755
--- a/tests/instman2.test
+++ b/t/instman2.sh
diff --git a/tests/instmany-mans.test b/t/instmany-mans.sh
index ceb3a9e0f..ceb3a9e0f 100755
--- a/tests/instmany-mans.test
+++ b/t/instmany-mans.sh
diff --git a/tests/instmany-python.test b/t/instmany-python.sh
index d0c5b1a95..d0c5b1a95 100755
--- a/tests/instmany-python.test
+++ b/t/instmany-python.sh
diff --git a/tests/instmany.test b/t/instmany.sh
index d334ebef1..d334ebef1 100755
--- a/tests/instmany.test
+++ b/t/instmany.sh
diff --git a/tests/instsh.test b/t/instsh.sh
index 1fd1b3b30..1fd1b3b30 100755
--- a/tests/instsh.test
+++ b/t/instsh.sh
diff --git a/tests/instsh2.test b/t/instsh2.sh
index 054beb9eb..054beb9eb 100755
--- a/tests/instsh2.test
+++ b/t/instsh2.sh
diff --git a/tests/instsh3.test b/t/instsh3.sh
index 3a527cb59..3a527cb59 100755
--- a/tests/instsh3.test
+++ b/t/instsh3.sh
diff --git a/tests/instspc.tap b/t/instspc.tap
index cbe0fdfdd..cbe0fdfdd 100755
--- a/tests/instspc.tap
+++ b/t/instspc.tap
diff --git a/tests/interp.test b/t/interp.sh
index b45d44932..b45d44932 100755
--- a/tests/interp.test
+++ b/t/interp.sh
diff --git a/tests/interp2.test b/t/interp2.sh
index 3ce33e253..3ce33e253 100755
--- a/tests/interp2.test
+++ b/t/interp2.sh
diff --git a/tests/java-check.test b/t/java-check.sh
index 230fb96f1..230fb96f1 100755
--- a/tests/java-check.test
+++ b/t/java-check.sh
diff --git a/tests/java-clean.test b/t/java-clean.sh
index 239920172..239920172 100755
--- a/tests/java-clean.test
+++ b/t/java-clean.sh
diff --git a/tests/java-compile-install.test b/t/java-compile-install.sh
index f3340ffa3..f3340ffa3 100755
--- a/tests/java-compile-install.test
+++ b/t/java-compile-install.sh
diff --git a/tests/java-compile-run-flat.test b/t/java-compile-run-flat.sh
index 79083af0b..79083af0b 100755
--- a/tests/java-compile-run-flat.test
+++ b/t/java-compile-run-flat.sh
diff --git a/tests/java-compile-run-nested.test b/t/java-compile-run-nested.sh
index d4a780023..d4a780023 100755
--- a/tests/java-compile-run-nested.test
+++ b/t/java-compile-run-nested.sh
diff --git a/tests/java-empty-classpath.test b/t/java-empty-classpath.sh
index 9ec48b28b..9ec48b28b 100755
--- a/tests/java-empty-classpath.test
+++ b/t/java-empty-classpath.sh
diff --git a/tests/java-extra.test b/t/java-extra.sh
index f2fc76d31..f2fc76d31 100755
--- a/tests/java-extra.test
+++ b/t/java-extra.sh
diff --git a/tests/java-mix.test b/t/java-mix.sh
index 6ec91855f..6ec91855f 100755
--- a/tests/java-mix.test
+++ b/t/java-mix.sh
diff --git a/tests/java-no-duplicate.test b/t/java-no-duplicate.sh
index 416fdb9c7..416fdb9c7 100755
--- a/tests/java-no-duplicate.test
+++ b/t/java-no-duplicate.sh
diff --git a/tests/java-nobase.test b/t/java-nobase.sh
index ff72a1338..ff72a1338 100755
--- a/tests/java-nobase.test
+++ b/t/java-nobase.sh
diff --git a/tests/java-noinst.test b/t/java-noinst.sh
index b11e6a000..b11e6a000 100755
--- a/tests/java-noinst.test
+++ b/t/java-noinst.sh
diff --git a/tests/java-rebuild.test b/t/java-rebuild.sh
index 7672943a3..7672943a3 100755
--- a/tests/java-rebuild.test
+++ b/t/java-rebuild.sh
diff --git a/tests/java-sources.test b/t/java-sources.sh
index 2de968391..2de968391 100755
--- a/tests/java-sources.test
+++ b/t/java-sources.sh
diff --git a/tests/java-uninstall.test b/t/java-uninstall.sh
index fb6bfa1be..fb6bfa1be 100755
--- a/tests/java-uninstall.test
+++ b/t/java-uninstall.sh
diff --git a/tests/java.test b/t/java.sh
index 16b125038..16b125038 100755
--- a/tests/java.test
+++ b/t/java.sh
diff --git a/tests/java2.test b/t/java2.sh
index c0b9f957d..c0b9f957d 100755
--- a/tests/java2.test
+++ b/t/java2.sh
diff --git a/tests/java3.test b/t/java3.sh
index 7d9463599..7d9463599 100755
--- a/tests/java3.test
+++ b/t/java3.sh
diff --git a/tests/javadir-undefined.test b/t/javadir-undefined.sh
index e2ed7f659..e2ed7f659 100755
--- a/tests/javadir-undefined.test
+++ b/t/javadir-undefined.sh
diff --git a/tests/javaflags.test b/t/javaflags.sh
index 364b21fe8..364b21fe8 100755
--- a/tests/javaflags.test
+++ b/t/javaflags.sh
diff --git a/tests/javaprim.test b/t/javaprim.sh
index fe5553572..fe5553572 100755
--- a/tests/javaprim.test
+++ b/t/javaprim.sh
diff --git a/tests/javasubst.test b/t/javasubst.sh
index 455b8c653..455b8c653 100755
--- a/tests/javasubst.test
+++ b/t/javasubst.sh
diff --git a/tests/ldadd.test b/t/ldadd.sh
index 8e16fb34b..8e16fb34b 100755
--- a/tests/ldadd.test
+++ b/t/ldadd.sh
diff --git a/tests/ldflags.test b/t/ldflags.sh
index 269af345e..269af345e 100755
--- a/tests/ldflags.test
+++ b/t/ldflags.sh
diff --git a/tests/lex-clean-cxx.test b/t/lex-clean-cxx.sh
index 9ff2dbc00..9ff2dbc00 100755
--- a/tests/lex-clean-cxx.test
+++ b/t/lex-clean-cxx.sh
diff --git a/tests/lex-clean.test b/t/lex-clean.sh
index 9b23f0104..9b23f0104 100755
--- a/tests/lex-clean.test
+++ b/t/lex-clean.sh
diff --git a/tests/lex-depend-cxx.test b/t/lex-depend-cxx.sh
index 52491022b..52491022b 100755
--- a/tests/lex-depend-cxx.test
+++ b/t/lex-depend-cxx.sh
diff --git a/tests/lex-depend-grep.test b/t/lex-depend-grep.sh
index 0fe32ed0c..0fe32ed0c 100755
--- a/tests/lex-depend-grep.test
+++ b/t/lex-depend-grep.sh
diff --git a/tests/lex-depend.test b/t/lex-depend.sh
index 9487f4a5c..9487f4a5c 100755
--- a/tests/lex-depend.test
+++ b/t/lex-depend.sh
diff --git a/tests/lex-lib-external.test b/t/lex-lib-external.sh
index 21802c5d2..21802c5d2 100755
--- a/tests/lex-lib-external.test
+++ b/t/lex-lib-external.sh
diff --git a/tests/lex-lib.test b/t/lex-lib.sh
index 0320f759c..0320f759c 100755
--- a/tests/lex-lib.test
+++ b/t/lex-lib.sh
diff --git a/tests/lex-libobj.test b/t/lex-libobj.sh
index 3bc29814b..3bc29814b 100755
--- a/tests/lex-libobj.test
+++ b/t/lex-libobj.sh
diff --git a/tests/lex-line.test b/t/lex-line.sh
index 05b6f9999..05b6f9999 100755
--- a/tests/lex-line.test
+++ b/t/lex-line.sh
diff --git a/tests/lex-nodist.test b/t/lex-nodist.sh
index 99e6b7b56..99e6b7b56 100755
--- a/tests/lex-nodist.test
+++ b/t/lex-nodist.sh
diff --git a/tests/lex-noyywrap.test b/t/lex-noyywrap.sh
index 1c4a13b19..1c4a13b19 100755
--- a/tests/lex-noyywrap.test
+++ b/t/lex-noyywrap.sh
diff --git a/tests/lex-pr204.test b/t/lex-pr204.sh
index 2e1b4e3f6..2e1b4e3f6 100755
--- a/tests/lex-pr204.test
+++ b/t/lex-pr204.sh
diff --git a/tests/lex-subobj-nodep.test b/t/lex-subobj-nodep.sh
index 44c977635..44c977635 100755
--- a/tests/lex-subobj-nodep.test
+++ b/t/lex-subobj-nodep.sh
diff --git a/tests/lex.test b/t/lex.sh
index d3d256a98..d3d256a98 100755
--- a/tests/lex.test
+++ b/t/lex.sh
diff --git a/tests/lex2.test b/t/lex2.sh
index 4b20d14f7..4b20d14f7 100755
--- a/tests/lex2.test
+++ b/t/lex2.sh
diff --git a/tests/lex3.test b/t/lex3.sh
index 125152b44..125152b44 100755
--- a/tests/lex3.test
+++ b/t/lex3.sh
diff --git a/tests/lex5.test b/t/lex5.sh
index 4b0663de0..4b0663de0 100755
--- a/tests/lex5.test
+++ b/t/lex5.sh
diff --git a/tests/lexcpp.test b/t/lexcpp.sh
index 717be0e03..717be0e03 100755
--- a/tests/lexcpp.test
+++ b/t/lexcpp.sh
diff --git a/tests/lexvpath.test b/t/lexvpath.sh
index c7316929f..c7316929f 100755
--- a/tests/lexvpath.test
+++ b/t/lexvpath.sh
diff --git a/tests/lflags.test b/t/lflags.sh
index bb939a785..bb939a785 100755
--- a/tests/lflags.test
+++ b/t/lflags.sh
diff --git a/tests/lflags2.test b/t/lflags2.sh
index 57b7b6715..57b7b6715 100755
--- a/tests/lflags2.test
+++ b/t/lflags2.sh
diff --git a/tests/libexec.test b/t/libexec.sh
index 24a934da3..24a934da3 100755
--- a/tests/libexec.test
+++ b/t/libexec.sh
diff --git a/tests/libobj-basic.test b/t/libobj-basic.sh
index 1165f1ecc..1165f1ecc 100755
--- a/tests/libobj-basic.test
+++ b/t/libobj-basic.sh
diff --git a/tests/libobj10.test b/t/libobj10.sh
index f19de7492..f19de7492 100755
--- a/tests/libobj10.test
+++ b/t/libobj10.sh
diff --git a/tests/libobj12.test b/t/libobj12.sh
index c3c005707..c3c005707 100755
--- a/tests/libobj12.test
+++ b/t/libobj12.sh
diff --git a/tests/libobj13.test b/t/libobj13.sh
index ef63d8b0d..ef63d8b0d 100755
--- a/tests/libobj13.test
+++ b/t/libobj13.sh
diff --git a/tests/libobj14.test b/t/libobj14.sh
index 50554de49..50554de49 100755
--- a/tests/libobj14.test
+++ b/t/libobj14.sh
diff --git a/tests/libobj15a.test b/t/libobj15a.sh
index d306b7157..d306b7157 100755
--- a/tests/libobj15a.test
+++ b/t/libobj15a.sh
diff --git a/tests/libobj15b.test b/t/libobj15b.sh
index f0466fd54..f0466fd54 100755
--- a/tests/libobj15b.test
+++ b/t/libobj15b.sh
diff --git a/tests/libobj15c.test b/t/libobj15c.sh
index 8fe521d9c..8fe521d9c 100755
--- a/tests/libobj15c.test
+++ b/t/libobj15c.sh
diff --git a/tests/libobj16a.test b/t/libobj16a.sh
index 2e1da263b..2e1da263b 100755
--- a/tests/libobj16a.test
+++ b/t/libobj16a.sh
diff --git a/tests/libobj16b.test b/t/libobj16b.sh
index 110ba1959..110ba1959 100755
--- a/tests/libobj16b.test
+++ b/t/libobj16b.sh
diff --git a/tests/libobj17.test b/t/libobj17.sh
index 6c54a284e..6c54a284e 100755
--- a/tests/libobj17.test
+++ b/t/libobj17.sh
diff --git a/tests/libobj18.test b/t/libobj18.sh
index 0ac743859..0ac743859 100755
--- a/tests/libobj18.test
+++ b/t/libobj18.sh
diff --git a/tests/libobj19.test b/t/libobj19.sh
index 4d9e2835d..4d9e2835d 100755
--- a/tests/libobj19.test
+++ b/t/libobj19.sh
diff --git a/tests/libobj2.test b/t/libobj2.sh
index ce655c232..ce655c232 100755
--- a/tests/libobj2.test
+++ b/t/libobj2.sh
diff --git a/tests/libobj20a.test b/t/libobj20a.sh
index d56be31da..d56be31da 100755
--- a/tests/libobj20a.test
+++ b/t/libobj20a.sh
diff --git a/tests/libobj20b.test b/t/libobj20b.sh
index f8ca60019..f8ca60019 100755
--- a/tests/libobj20b.test
+++ b/t/libobj20b.sh
diff --git a/tests/libobj20c.test b/t/libobj20c.sh
index 7ae51bf21..7ae51bf21 100755
--- a/tests/libobj20c.test
+++ b/t/libobj20c.sh
diff --git a/tests/libobj3.test b/t/libobj3.sh
index 37ec6bf77..37ec6bf77 100755
--- a/tests/libobj3.test
+++ b/t/libobj3.sh
diff --git a/tests/libobj4.test b/t/libobj4.sh
index 68711afc8..68711afc8 100755
--- a/tests/libobj4.test
+++ b/t/libobj4.sh
diff --git a/tests/libobj5.test b/t/libobj5.sh
index 036ae561d..036ae561d 100755
--- a/tests/libobj5.test
+++ b/t/libobj5.sh
diff --git a/tests/libobj7.test b/t/libobj7.sh
index 46f0f9841..46f0f9841 100755
--- a/tests/libobj7.test
+++ b/t/libobj7.sh
diff --git a/tests/library.test b/t/library.sh
index dffe658cb..dffe658cb 100755
--- a/tests/library.test
+++ b/t/library.sh
diff --git a/tests/library2.test b/t/library2.sh
index dfa87584c..dfa87584c 100755
--- a/tests/library2.test
+++ b/t/library2.sh
diff --git a/tests/library3.test b/t/library3.sh
index 27a2b156f..27a2b156f 100755
--- a/tests/library3.test
+++ b/t/library3.sh
diff --git a/tests/libtoo10.test b/t/libtoo10.sh
index 0218ef32c..0218ef32c 100755
--- a/tests/libtoo10.test
+++ b/t/libtoo10.sh
diff --git a/tests/libtoo11.test b/t/libtoo11.sh
index cd55cc014..cd55cc014 100755
--- a/tests/libtoo11.test
+++ b/t/libtoo11.sh
diff --git a/tests/libtool-macros.test b/t/libtool-macros.sh
index e5c77ac1d..e5c77ac1d 100755
--- a/tests/libtool-macros.test
+++ b/t/libtool-macros.sh
diff --git a/tests/libtool.test b/t/libtool.sh
index 7b267a714..7b267a714 100755
--- a/tests/libtool.test
+++ b/t/libtool.sh
diff --git a/tests/libtool2.test b/t/libtool2.sh
index 3b8a78b60..3b8a78b60 100755
--- a/tests/libtool2.test
+++ b/t/libtool2.sh
diff --git a/tests/libtool3.test b/t/libtool3.sh
index dbcd519d9..dbcd519d9 100755
--- a/tests/libtool3.test
+++ b/t/libtool3.sh
diff --git a/tests/libtool4.test b/t/libtool4.sh
index 2ce92dd29..2ce92dd29 100755
--- a/tests/libtool4.test
+++ b/t/libtool4.sh
diff --git a/tests/libtool5.test b/t/libtool5.sh
index b9e778b36..b9e778b36 100755
--- a/tests/libtool5.test
+++ b/t/libtool5.sh
diff --git a/tests/libtool6.test b/t/libtool6.sh
index 13dbc738e..13dbc738e 100755
--- a/tests/libtool6.test
+++ b/t/libtool6.sh
diff --git a/tests/libtool7.test b/t/libtool7.sh
index bc8eacae3..bc8eacae3 100755
--- a/tests/libtool7.test
+++ b/t/libtool7.sh
diff --git a/tests/libtool8.test b/t/libtool8.sh
index 9182c278e..9182c278e 100755
--- a/tests/libtool8.test
+++ b/t/libtool8.sh
diff --git a/tests/libtool9.test b/t/libtool9.sh
index b4d7baa87..b4d7baa87 100755
--- a/tests/libtool9.test
+++ b/t/libtool9.sh
diff --git a/tests/license.test b/t/license.sh
index c3dad694e..c3dad694e 100755
--- a/tests/license.test
+++ b/t/license.sh
diff --git a/tests/license2.test b/t/license2.sh
index d447eba2f..d447eba2f 100755
--- a/tests/license2.test
+++ b/t/license2.sh
diff --git a/tests/link_c_cxx.test b/t/link_c_cxx.sh
index a3dac1b5b..a3dac1b5b 100755
--- a/tests/link_c_cxx.test
+++ b/t/link_c_cxx.sh
diff --git a/tests/link_cond.test b/t/link_cond.sh
index 7b9fd5a3c..7b9fd5a3c 100755
--- a/tests/link_cond.test
+++ b/t/link_cond.sh
diff --git a/tests/link_dist.test b/t/link_dist.sh
index 8ba05dfd4..8ba05dfd4 100755
--- a/tests/link_dist.test
+++ b/t/link_dist.sh
diff --git a/tests/link_f90_only.test b/t/link_f90_only.sh
index a34d6c6d2..a34d6c6d2 100755
--- a/tests/link_f90_only.test
+++ b/t/link_f90_only.sh
diff --git a/tests/link_f_only.test b/t/link_f_only.sh
index 25f3ef93e..25f3ef93e 100755
--- a/tests/link_f_only.test
+++ b/t/link_f_only.sh
diff --git a/tests/link_fc.test b/t/link_fc.sh
index 6cf8b8bd2..6cf8b8bd2 100755
--- a/tests/link_fc.test
+++ b/t/link_fc.sh
diff --git a/tests/link_fccxx.test b/t/link_fccxx.sh
index ede7b5a59..ede7b5a59 100755
--- a/tests/link_fccxx.test
+++ b/t/link_fccxx.sh
diff --git a/tests/link_fcxx.test b/t/link_fcxx.sh
index 545f6a675..545f6a675 100755
--- a/tests/link_fcxx.test
+++ b/t/link_fcxx.sh
diff --git a/tests/link_override.test b/t/link_override.sh
index 48d32a26a..48d32a26a 100755
--- a/tests/link_override.test
+++ b/t/link_override.sh
diff --git a/tests/lisp2.test b/t/lisp2.sh
index 25d174f71..25d174f71 100755
--- a/tests/lisp2.test
+++ b/t/lisp2.sh
diff --git a/tests/lisp3.test b/t/lisp3.sh
index a1531d355..a1531d355 100755
--- a/tests/lisp3.test
+++ b/t/lisp3.sh
diff --git a/tests/lisp4.test b/t/lisp4.sh
index 8d2de591a..8d2de591a 100755
--- a/tests/lisp4.test
+++ b/t/lisp4.sh
diff --git a/tests/lisp5.test b/t/lisp5.sh
index 997a56e73..997a56e73 100755
--- a/tests/lisp5.test
+++ b/t/lisp5.sh
diff --git a/tests/lisp6.test b/t/lisp6.sh
index 9635ea275..9635ea275 100755
--- a/tests/lisp6.test
+++ b/t/lisp6.sh
diff --git a/tests/lisp7.test b/t/lisp7.sh
index 79799d160..79799d160 100755
--- a/tests/lisp7.test
+++ b/t/lisp7.sh
diff --git a/tests/lisp8.test b/t/lisp8.sh
index 299ecd0a4..299ecd0a4 100755
--- a/tests/lisp8.test
+++ b/t/lisp8.sh
diff --git a/tests/lispdry.test b/t/lispdry.sh
index a89ffe171..a89ffe171 100755
--- a/tests/lispdry.test
+++ b/t/lispdry.sh
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
new file mode 100644
index 000000000..32e8c1765
--- /dev/null
+++ b/t/list-of-tests.mk
@@ -0,0 +1,1274 @@
+## Makefile fragment that holds the list of test scripts of the automake
+## testsuite.  This fragment is meant to be included by the Makefile.am,
+## but also to be executed directly by make when bootstrapping automake.
+
+## Copyright (C) 2011-2012 Free Software Foundation, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# FIXME: this "expected failures" are in truth an hack used to
+# FIXME: to verify that some incorrect usages of our perl libraries
+# FIXME: raise an error.  We should find a cleaner way to check that.
+perl_fake_XFAIL_TESTS = \
+pm/Cond2.pl \
+pm/Cond3.pl \
+pm/DisjCon2.pl \
+pm/DisjCon3.pl \
+pm/Version2.pl \
+pm/Version3.pl
+
+XFAIL_TESTS = \
+all.sh \
+yacc-bison-skeleton-cxx.sh \
+yacc-bison-skeleton.sh \
+cond17.sh \
+gcj6.sh \
+override-conditional-2.sh \
+dist-pr109765.sh \
+instdir-cond2.sh \
+java-nobase.sh \
+objext-pr10128.sh \
+parallel-tests-many.sh \
+pr8365-remake-timing.sh \
+lex-subobj-nodep.sh \
+remake-am-pr10111.sh \
+remake-m4-pr10111.sh \
+txinfo5.sh \
+$(perl_fake_XFAIL_TESTS)
+
+perl_TESTS = \
+pm/Cond2.pl \
+pm/Cond3.pl \
+pm/Condition.pl \
+pm/Condition-t.pl \
+pm/DisjCon2.pl \
+pm/DisjCon3.pl \
+pm/DisjConditions.pl \
+pm/DisjConditions-t.pl \
+pm/Version.pl \
+pm/Version2.pl \
+pm/Version3.pl \
+pm/Wrap.pl
+
+# The order here is mostly alphabetical, with the deliberate exception
+# that tests having a high runtime (especially TAP tests that run various
+# checks sequentially) are listed early; this improves performance on
+# concurrent testsuite runs.
+handwritten_TESTS = \
+get-sysconf.sh \
+$(perl_TESTS) \
+instspc.tap \
+aclocal.sh \
+aclocal3.sh \
+aclocal4.sh \
+aclocal5.sh \
+aclocal6.sh \
+aclocal7.sh \
+aclocal8.sh \
+aclocal9.sh \
+acloca10.sh \
+acloca11.sh \
+acloca12.sh \
+acloca13.sh \
+acloca14.sh \
+acloca15.sh \
+acloca16.sh \
+acloca17.sh \
+acloca18.sh \
+acloca19.sh \
+acloca20.sh \
+acloca21.sh \
+acloca22.sh \
+acloca23.sh \
+aclocal-acdir.sh \
+aclocal-install-absdir.sh \
+aclocal-print-acdir.sh \
+aclocal-path.sh \
+aclocal-path-install.sh \
+aclocal-path-install-serial.sh \
+aclocal-path-nonexistent.sh \
+aclocal-path-precedence.sh \
+aclocal-install-fail.sh \
+aclocal-install-mkdir.sh \
+aclocal-no-install-no-mkdir.sh \
+aclocal-verbose-install.sh \
+ac-output-old.tap \
+acsilent.sh \
+acsubst.sh \
+acsubst2.sh \
+add-missing.tap \
+all.sh \
+all2.sh \
+alloca.sh \
+alloca2.sh \
+alpha.sh \
+alpha2.sh \
+amhello-cflags.sh \
+amhello-cross-compile.sh \
+amhello-binpkg.sh \
+amassign.sh \
+ammissing.sh \
+amopt.sh \
+amopts-location.sh \
+amopts-variable-expansion.sh \
+amsubst.sh \
+ansi2knr-no-more.sh \
+ar-lib.sh \
+ar-lib2.sh \
+ar-lib3.sh \
+ar-lib4.sh \
+ar-lib5a.sh \
+ar-lib5b.sh \
+ar-lib6a.sh \
+ar-lib6b.sh \
+ar-lib7.sh \
+ar.sh \
+ar2.sh \
+ar3.sh \
+ar4.sh \
+ar5.sh \
+asm.sh \
+asm2.sh \
+asm3.sh \
+autodist.sh \
+autodist-subdir.sh \
+autodist-acconfig.sh \
+autodist-acconfig-no-subdir.sh \
+autodist-aclocal-m4.sh \
+autodist-config-headers.sh \
+autodist-configure-no-subdir.sh \
+autodist-no-duplicate.sh \
+autodist-stamp-vti.sh \
+autohdr.sh \
+autohdr2.sh \
+autohdr3.sh \
+autohdr4.sh \
+autohdrdry.sh \
+automake-cmdline.tap \
+auxdir.sh \
+auxdir6.sh \
+auxdir7.sh \
+auxdir8.sh \
+auxdir-autodetect.sh \
+auxdir-computed.tap \
+auxdir-misplaced.sh \
+auxdir-nonexistent.sh \
+auxdir-unportable.tap \
+backcompat.sh \
+backcompat2.sh \
+backcompat3.sh \
+backcompat4.sh \
+backcompat5.sh \
+backcompat6.sh \
+backsl.sh \
+backsl2.sh \
+backsl3.sh \
+backsl4.sh \
+badline.sh \
+badopt.sh \
+badprog.sh \
+block.sh \
+bsource.sh \
+candist.sh \
+canon.sh \
+canon2.sh \
+canon3.sh \
+canon4.sh \
+canon5.sh \
+canon6.sh \
+canon7.sh \
+canon8.sh \
+canon-name.sh \
+ccnoco.sh \
+ccnoco2.sh \
+ccnoco3.sh \
+check.sh \
+check2.sh \
+check3.sh \
+check4.sh \
+check5.sh \
+check6.sh \
+check7.sh \
+check8.sh \
+check10.sh \
+check11.sh \
+check12.sh \
+check-subst.sh \
+check-subst-prog.sh \
+check-exported-srcdir.sh \
+check-fd-redirect.sh \
+check-tests-in-builddir.sh \
+check-no-test-driver.sh \
+check-concurrency-bug9245.sh \
+checkall.sh \
+clean.sh \
+clean2.sh \
+colneq.sh \
+colneq2.sh \
+colneq3.sh \
+colon.sh \
+colon2.sh \
+colon3.sh \
+colon4.sh \
+colon5.sh \
+colon6.sh \
+colon7.sh \
+color.sh \
+color2.sh \
+comment.sh \
+comment2.sh \
+comment3.sh \
+comment4.sh \
+comment5.sh \
+comment6.sh \
+comment7.sh \
+comment8.sh \
+comment9.sh \
+commen10.sh \
+commen11.sh \
+comments-in-var-def.sh \
+compile.sh \
+compile2.sh \
+compile3.sh \
+compile4.sh \
+compile5.sh \
+compile6.sh \
+compile_f90_c_cxx.sh \
+compile_f_c_cxx.sh \
+cond-basic.sh \
+cond.sh \
+cond2.sh \
+cond3.sh \
+cond4.sh \
+cond5.sh \
+cond6.sh \
+cond7.sh \
+cond8.sh \
+cond9.sh \
+cond10.sh \
+cond11.sh \
+cond13.sh \
+cond14.sh \
+cond15.sh \
+cond16.sh \
+cond17.sh \
+cond18.sh \
+cond19.sh \
+cond20.sh \
+cond21.sh \
+cond22.sh \
+cond23.sh \
+cond24.sh \
+cond25.sh \
+cond26.sh \
+cond27.sh \
+cond28.sh \
+cond29.sh \
+cond30.sh \
+cond31.sh \
+cond32.sh \
+cond33.sh \
+cond34.sh \
+cond35.sh \
+cond36.sh \
+cond37.sh \
+cond38.sh \
+cond39.sh \
+cond40.sh \
+cond41.sh \
+cond42.sh \
+cond43.sh \
+cond44.sh \
+cond45.sh \
+cond46.sh \
+condd.sh \
+condhook.sh \
+condhook2.sh \
+condinc.sh \
+condinc2.sh \
+condlib.sh \
+condman2.sh \
+condman3.sh \
+configure.sh \
+confdeps.sh \
+conff.sh \
+conff2.sh \
+conffile-leading-dot.sh \
+confh.sh \
+confh4.sh \
+confh5.sh \
+confh6.sh \
+confh7.sh \
+confh8.sh \
+confincl.sh \
+conflnk.sh \
+conflnk2.sh \
+conflnk3.sh \
+conflnk4.sh \
+confsub.sh \
+confvar.sh \
+confvar2.sh \
+copy.sh \
+cscope.tap \
+cscope2.sh \
+cscope3.sh \
+cxx.sh \
+cxx2.sh \
+cxxcpp.sh \
+cxxlibobj.sh \
+cxxlink.sh \
+cxxnoc.sh \
+cxxo.sh \
+cygnus-check-without-all.sh \
+cygnus-dependency-tracking.sh \
+cygnus-imply-foreign.sh \
+cygnus-no-dist.sh \
+cygnus-no-installinfo.sh \
+cygnus-requires-maintainer-mode.sh \
+cygwin32.sh \
+dash.sh \
+defun.sh \
+defun2.sh \
+dejagnu.sh \
+dejagnu2.sh \
+dejagnu3.sh \
+dejagnu4.sh \
+dejagnu5.sh \
+dejagnu6.sh \
+dejagnu7.sh \
+dejagnu-absolute-builddir.sh \
+dejagnu-relative-srcdir.sh \
+dejagnu-siteexp-extend.sh \
+dejagnu-siteexp-append.sh \
+dejagnu-siteexp-useredit.sh \
+deleted-am.sh \
+deleted-m4.sh \
+depacl2.sh \
+depcomp.sh \
+depcomp2.sh \
+depcomp8a.sh \
+depcomp8b.sh \
+depdist.sh \
+depend.sh \
+depend3.sh \
+depend4.sh \
+depend5.sh \
+depend6.sh \
+deprecated-acinit.sh \
+destdir.sh \
+dirlist.sh \
+dirlist2.sh \
+dirlist-abspath.sh \
+discover.sh \
+dist-formats.tap \
+dist-auxdir-many-subdirs.sh \
+dist-auxfile-2.sh \
+dist-auxfile.sh \
+dist-included-parent-dir.sh \
+dist-missing-am.sh \
+dist-missing-included-m4.sh \
+dist-missing-m4.sh \
+dist-readonly.sh \
+dist-repeated.sh \
+dist-pr109765.sh \
+distcleancheck.sh \
+distcom2.sh \
+distcom3.sh \
+distcom4.sh \
+distcom5.sh \
+distcom-subdir.sh \
+distdir.sh \
+disthook.sh \
+distlinks.sh \
+distlinksbrk.sh \
+distname.sh \
+distcheck-configure-flags.sh \
+distcheck-configure-flags-am.sh \
+distcheck-configure-flags-subpkg.sh \
+distcheck-hook.sh \
+distcheck-hook2.sh \
+distcheck-writable-srcdir.sh \
+distcheck-missing-m4.sh \
+distcheck-outdated-m4.sh \
+distcheck-override-infodir.sh \
+distcheck-pr9579.sh \
+distcheck-pr10470.sh \
+dmalloc.sh \
+doc-parsing-buglets-colneq-subst.sh \
+doc-parsing-buglets-tabs.sh \
+dollar.sh \
+dollarvar.sh \
+dollarvar2.sh \
+double.sh \
+dup2.sh \
+else.sh \
+empty.sh \
+empty2.sh \
+empty3.sh \
+empty4.sh \
+exdir.sh \
+exdir2.sh \
+exdir3.sh \
+exeext.sh \
+exeext2.sh \
+exeext3.sh \
+exeext4.sh \
+exsource.sh \
+ext.sh \
+ext2.sh \
+ext3.sh \
+extra.sh \
+extra2.sh \
+extra3.sh \
+extra4.sh \
+extra5.sh \
+extra6.sh \
+extra7.sh \
+extra8.sh \
+extra9.sh \
+extra10.sh \
+extra11.sh \
+extra12.sh \
+extra-programs-empty.sh \
+extra-portability.sh \
+extra-portability2.sh \
+extra-portability3.sh \
+extradep.sh \
+extradep2.sh \
+f90only.sh \
+flavor.sh \
+flibs.sh \
+fn99.sh \
+fn99subdir.sh \
+fnoc.sh \
+fo.sh \
+forcemiss.sh \
+forcemiss2.sh \
+fort1.sh \
+fort2.sh \
+fort4.sh \
+fort5.sh \
+fonly.sh \
+fortdep.sh \
+gcj.sh \
+gcj2.sh \
+gcj3.sh \
+gcj4.sh \
+gcj5.sh \
+gcj6.sh \
+gettext.sh \
+gettext2.sh \
+gettext3.sh \
+gnumake.sh \
+gnuwarn.sh \
+gnuwarn2.sh \
+gnits.sh \
+gnits2.sh \
+gnits3.sh \
+hdr-vars-defined-once.sh \
+header.sh \
+help.sh \
+help2.sh \
+help3.sh \
+help4.sh \
+help-depend.sh \
+help-depend2.sh \
+help-dmalloc.sh \
+help-init.sh \
+help-lispdir.sh \
+help-multilib.sh \
+help-python.sh \
+help-silent.sh \
+help-upc.sh \
+hfs.sh \
+implicit.sh \
+info.sh \
+init.sh \
+init2.sh \
+insh2.sh \
+install2.sh \
+installdir.sh \
+instsh.sh \
+instsh2.sh \
+instsh3.sh \
+instdat.sh \
+instdat2.sh \
+instdir.sh \
+instdir2.sh \
+instdir-cond.sh \
+instdir-cond2.sh \
+instdir-no-empty.sh \
+instdir-java.sh \
+instdir-lisp.sh \
+instdir-ltlib.sh \
+instdir-prog.sh \
+instdir-python.sh \
+instdir-texi.sh \
+instexec.sh \
+instfail.sh \
+instfail-info.sh \
+instfail-java.sh \
+instfail-libtool.sh \
+insthook.sh \
+instman.sh \
+instman2.sh \
+instmany.sh \
+instmany-mans.sh \
+instmany-python.sh \
+install-info-dir.sh \
+interp.sh \
+interp2.sh \
+java.sh \
+java2.sh \
+java3.sh \
+javadir-undefined.sh \
+javaflags.sh \
+java-check.sh \
+java-clean.sh \
+java-compile-install.sh \
+java-compile-run-flat.sh \
+java-compile-run-nested.sh \
+java-empty-classpath.sh \
+javaprim.sh \
+javasubst.sh \
+java-extra.sh \
+java-mix.sh \
+java-no-duplicate.sh \
+java-nobase.sh \
+java-noinst.sh \
+java-rebuild.sh \
+java-sources.sh \
+java-uninstall.sh \
+ldadd.sh \
+ldflags.sh \
+lex.sh \
+lex2.sh \
+lex3.sh \
+lex5.sh \
+lexcpp.sh \
+lexvpath.sh \
+lex-subobj-nodep.sh \
+lex-lib.sh \
+lex-lib-external.sh \
+lex-libobj.sh \
+lex-noyywrap.sh \
+lex-clean-cxx.sh \
+lex-clean.sh \
+lex-depend-cxx.sh \
+lex-depend-grep.sh \
+lex-depend.sh \
+lex-line.sh \
+lex-nodist.sh \
+lex-pr204.sh \
+lflags.sh \
+lflags2.sh \
+libexec.sh \
+libobj-basic.sh \
+libobj2.sh \
+libobj3.sh \
+libobj4.sh \
+libobj5.sh \
+libobj7.sh \
+libobj10.sh \
+libobj12.sh \
+libobj13.sh \
+libobj14.sh \
+libobj15a.sh \
+libobj15b.sh \
+libobj15c.sh \
+libobj16a.sh \
+libobj16b.sh \
+libobj17.sh \
+libobj18.sh \
+libobj19.sh \
+libobj20a.sh \
+libobj20b.sh \
+libobj20c.sh \
+library.sh \
+library2.sh \
+library3.sh \
+libtool.sh \
+libtool2.sh \
+libtool3.sh \
+libtool4.sh \
+libtool5.sh \
+libtool6.sh \
+libtool7.sh \
+libtool8.sh \
+libtool9.sh \
+libtoo10.sh \
+libtoo11.sh \
+license.sh \
+license2.sh \
+link_c_cxx.sh \
+link_cond.sh \
+link_dist.sh \
+link_f90_only.sh \
+link_fc.sh \
+link_fccxx.sh \
+link_fcxx.sh \
+link_f_only.sh \
+link_override.sh \
+lisp2.sh \
+lisp3.sh \
+lisp4.sh \
+lisp5.sh \
+lisp6.sh \
+lisp7.sh \
+lisp8.sh \
+lispdry.sh \
+listval.sh \
+location.sh \
+longline.sh \
+longlin2.sh \
+ltcond.sh \
+ltcond2.sh \
+ltconv.sh \
+ltdeps.sh \
+ltinit.sh \
+ltinstloc.sh \
+ltlibobjs.sh \
+ltlibsrc.sh \
+ltorder.sh \
+lzma.sh \
+m4-inclusion.sh \
+maintclean.sh \
+maintclean-vpath.sh \
+maintmode-configure-msg.sh \
+make.sh \
+makefile-deps.sh \
+makej.sh \
+makej2.sh \
+maken.sh \
+maken3.sh \
+make-dryrun.tap \
+makevars.sh \
+man.sh \
+man2.sh \
+man3.sh \
+man4.sh \
+man5.sh \
+man6.sh \
+man7.sh \
+man8.sh \
+mdate.sh \
+mdate2.sh \
+mdate3.sh \
+mdate4.sh \
+mdate5.sh \
+mdate6.sh \
+missing.sh \
+missing2.sh \
+missing3.sh \
+missing4.sh \
+missing5.sh \
+missing6.sh \
+missing-auxfile-stops-makefiles-creation.sh \
+mkinstall.sh \
+mkinst2.sh \
+mkinst3.sh \
+mmode.sh \
+mmodely.sh \
+multlib.sh \
+no-extra-makefile-code.sh \
+no-outdir-option.sh \
+nobase.sh \
+nobase-libtool.sh \
+nobase-python.sh \
+nobase-nodist.sh \
+nodef.sh \
+nodef2.sh \
+nodep.sh \
+nodep2.sh \
+nodepcomp.sh \
+nodist.sh \
+nodist2.sh \
+nodist3.sh \
+noinst.sh \
+noinstdir.sh \
+nolink.sh \
+nostdinc.sh \
+notrans.sh \
+number.sh \
+objc.sh \
+objc2.sh \
+objext-pr10128.sh \
+obsolete.sh \
+oldvars.sh \
+order.sh \
+output.sh \
+output2.sh \
+output3.sh \
+output4.sh \
+output5.sh \
+output6.sh \
+output7.sh \
+output8.sh \
+output9.sh \
+output10.sh \
+output11.sh \
+output12.sh \
+output13.sh \
+output-order.sh \
+override-conditional-1.sh \
+override-conditional-2.sh \
+override-html.sh \
+override-suggest-local.sh \
+parallel-am.sh \
+parallel-am2.sh \
+parallel-am3.sh \
+serial-tests.sh \
+parallel-tests.sh \
+parallel-tests2.sh \
+parallel-tests3.sh \
+parallel-tests5.sh \
+parallel-tests6.sh \
+parallel-tests8.sh \
+parallel-tests9.sh \
+parallel-tests10.sh \
+parallel-tests-exeext.sh \
+parallel-tests-suffix.sh \
+parallel-tests-suffix-prog.sh \
+parallel-tests-log-compiler-1.sh \
+parallel-tests-log-compiler-2.sh \
+parallel-tests-dry-run-1.sh \
+parallel-tests-dry-run-2.sh \
+parallel-tests-fd-redirect.sh \
+parallel-tests-fd-redirect-exeext.sh \
+parallel-tests-extra-programs.sh \
+parallel-tests-unreadable.sh \
+parallel-tests-subdir.sh \
+parallel-tests-interrupt.tap \
+parallel-tests-reset-term.sh \
+parallel-tests-harderror.sh \
+parallel-tests-log-override-1.sh \
+parallel-tests-log-override-2.sh \
+parallel-tests-log-override-recheck.sh \
+parallel-tests-log-compiler-example.sh \
+parallel-tests-cmdline-override.sh \
+parallel-tests-fork-bomb.sh \
+parallel-tests-empty-testlogs.sh \
+parallel-tests-driver-install.sh \
+parallel-tests-no-color-in-log.sh \
+parallel-tests-no-spurious-summary.sh \
+parallel-tests-exit-statuses.sh \
+parallel-tests-console-output.sh \
+parallel-tests-once.sh \
+parallel-tests-trailing-bslash.sh \
+parallel-tests-many.sh \
+tests-environment.sh \
+am-tests-environment.sh \
+tests-environment-backcompat.sh \
+testsuite-summary-color.sh \
+testsuite-summary-count.sh \
+testsuite-summary-count-many.sh \
+testsuite-summary-reference-log.sh \
+test-driver-acsubst.sh \
+test-driver-cond.sh \
+test-driver-custom-no-extra-driver.sh \
+test-driver-custom.sh \
+test-driver-custom-xfail-tests.sh \
+test-driver-custom-multitest.sh \
+test-driver-custom-multitest-recheck.sh \
+test-driver-custom-multitest-recheck2.sh \
+test-driver-create-log-dir.sh \
+test-driver-strip-vpath.sh \
+test-driver-trs-suffix-registered.sh \
+test-driver-fail.sh \
+test-driver-is-distributed.sh \
+test-harness-vpath-rewrite.sh \
+test-log.sh \
+test-logs-repeated.sh \
+test-metadata-global-log.sh \
+test-metadata-global-result.sh \
+test-metadata-recheck.sh \
+test-metadata-results.sh \
+test-missing.sh \
+test-missing2.sh \
+test-trs-basic.sh \
+test-trs-recover.sh \
+test-trs-recover2.sh \
+test-extensions.sh \
+test-extensions-cond.sh \
+parse.sh \
+percent.sh \
+percent2.sh \
+phony.sh \
+pluseq.sh \
+pluseq2.sh \
+pluseq3.sh \
+pluseq4.sh \
+pluseq5.sh \
+pluseq6.sh \
+pluseq7.sh \
+pluseq8.sh \
+pluseq9.sh \
+pluseq10.sh \
+pluseq11.sh \
+posixsubst-data.sh \
+posixsubst-extradist.sh \
+posixsubst-ldadd.sh \
+posixsubst-libraries.sh \
+posixsubst-ltlibraries.sh \
+posixsubst-programs.sh \
+posixsubst-scripts.sh \
+posixsubst-sources.sh \
+posixsubst-tests.sh \
+postproc.sh \
+ppf77.sh \
+pr2.sh \
+pr9.sh \
+pr72.sh \
+pr87.sh \
+pr211.sh \
+pr220.sh \
+pr224.sh \
+pr229.sh \
+pr243.sh \
+pr266.sh \
+pr279.sh \
+pr279-2.sh \
+pr287.sh \
+pr300-lib.sh \
+pr300-ltlib.sh \
+pr300-prog.sh \
+pr307.sh \
+pr401.sh \
+pr401b.sh \
+pr401c.sh \
+prefix.sh \
+primary.sh \
+primary2.sh \
+primary3.sh \
+primary-prefix-invalid-couples.tap \
+primary-prefix-valid-couples.sh \
+primary-prefix-couples-force-valid.sh \
+primary-prefix-couples-documented-valid.sh \
+print-libdir.sh \
+proginst.sh \
+programs-primary-rewritten.sh \
+py-compile-basic.sh \
+py-compile-basic2.sh \
+py-compile-basedir.sh \
+py-compile-destdir.sh \
+py-compile-env.sh \
+py-compile-option-terminate.sh \
+py-compile-usage.sh \
+python.sh \
+python2.sh \
+python3.sh \
+python4.sh \
+python5.sh \
+python5b.sh \
+python6.sh \
+python7.sh \
+python8.sh \
+python9.sh \
+python10.sh \
+python11.sh \
+python12.sh \
+python-dist.sh \
+python-vars.sh \
+python-virtualenv.sh \
+python-pr10995.sh \
+recurs.sh \
+recurs2.sh \
+remake.sh \
+remake1a.sh \
+remake2.sh \
+remake3.sh \
+remake3a.sh \
+remake4.sh \
+remake5.sh \
+remake6.sh \
+remake7.sh \
+remake8a.sh \
+remake8b.sh \
+remake9a.sh \
+remake9b.sh \
+remake9c.sh \
+remake9d.sh \
+remake10a.sh \
+remake10b.sh \
+remake10c.sh \
+remake11.sh \
+remake12.sh \
+remake-all-1.sh \
+remake-all-2.sh \
+remake-subdir-from-subdir.sh \
+remake-subdir-gnu.sh \
+remake-subdir.sh \
+remake-subdir2.sh \
+remake-subdir-long-time.sh \
+remake-gnulib-add-acsubst.sh \
+remake-gnulib-add-header.sh \
+remake-gnulib-remove-header.sh \
+remake-moved-m4-file.sh \
+remake-deleted-m4-file.sh \
+remake-renamed-m4-file.sh \
+remake-renamed-m4-macro-and-file.sh \
+remake-renamed-m4-macro.sh \
+remake-am-pr10111.sh \
+remake-m4-pr10111.sh \
+remake-deleted-am-2.sh \
+remake-deleted-am-subdir.sh \
+remake-deleted-am.sh \
+remake-renamed-am.sh \
+pr8365-remake-timing.sh \
+req.sh \
+reqd.sh \
+reqd2.sh \
+repeated-options.sh \
+rst-formatting.sh \
+rulepat.sh \
+self-check-cleanup.tap \
+self-check-configure-help.sh \
+self-check-dir.tap \
+self-check-env-sanitize.tap \
+self-check-exit.tap \
+self-check-explicit-skips.sh \
+self-check-is_newest.tap \
+self-check-me.tap \
+self-check-reexec.tap \
+self-check-report.sh \
+self-check-sanity.sh \
+self-check-seq.tap \
+self-check-is-blocked-signal.tap \
+self-check-tap.sh \
+self-check-unindent.tap \
+sanity.sh \
+scripts.sh \
+seenc.sh \
+silent.sh \
+silent2.sh \
+silent3.sh \
+silent4.sh \
+silent6.sh \
+silent7.sh \
+silent8.sh \
+silent9.sh \
+silentcxx.sh \
+silentcxx-gcc.sh \
+silentf77.sh \
+silentf90.sh \
+silent-amopts.sh \
+silent-many-gcc.sh \
+silent-many-generic.sh \
+silent-nowarn.sh \
+silent-configsite.sh \
+silent-nested-vars.sh \
+silent-lex.sh \
+silent-yacc.sh \
+silent-yacc-headers.sh \
+srcsub.sh \
+srcsub2.sh \
+space.sh \
+specflg.sh \
+specflg2.sh \
+specflg3.sh \
+specflg6.sh \
+specflg7.sh \
+specflg8.sh \
+specflg9.sh \
+specflg10.sh \
+specflg-dummy.sh \
+spell.sh \
+spell2.sh \
+spell3.sh \
+spelling.sh \
+spy.sh \
+spy-rm.tap \
+stdinc.sh \
+stamph2.sh \
+stdlib.sh \
+stdlib2.sh \
+strictness-override.sh \
+strictness-precedence.sh \
+strip.sh \
+strip2.sh \
+strip3.sh \
+subdir.sh \
+subdir2.sh \
+subdir3.sh \
+subdir4.sh \
+subdir5.sh \
+subdir6.sh \
+subdir7.sh \
+subdir8.sh \
+subdir9.sh \
+subdir10.sh \
+subdirbuiltsources.sh \
+subcond.sh \
+subcond2.sh \
+subcond3.sh \
+subobj.sh \
+subobj2.sh \
+subobj4.sh \
+subobj5.sh \
+subobj6.sh \
+subobj7.sh \
+subobj8.sh \
+subobj9.sh \
+subobj10.sh \
+subobj11a.sh \
+subobj11b.sh \
+subobj11c.sh \
+subobjname.sh \
+subpkg.sh \
+subpkg2.sh \
+subpkg3.sh \
+subpkg4.sh \
+subpkg-yacc.sh \
+subst.sh \
+subst3.sh \
+subst4.sh \
+subst5.sh \
+subst-no-trailing-empty-line.sh \
+substref.sh \
+substre2.sh \
+substtarg.sh \
+suffix.sh \
+suffix2.sh \
+suffix3.tap \
+suffix4.sh \
+suffix5.sh \
+suffix6.sh \
+suffix6b.sh \
+suffix6c.sh \
+suffix7.sh \
+suffix8.tap \
+suffix9.sh \
+suffix10.tap \
+suffix11.tap \
+suffix12.sh \
+suffix13.sh \
+suffix-chain.tap \
+symlink.sh \
+symlink2.sh \
+syntax.sh \
+tap-ambiguous-directive.sh \
+tap-autonumber.sh \
+tap-bailout.sh \
+tap-bailout-leading-space.sh \
+tap-bailout-and-logging.sh \
+tap-bailout-suppress-badexit.sh \
+tap-bailout-suppress-later-diagnostic.sh \
+tap-bailout-suppress-later-errors.sh \
+tap-color.sh \
+tap-deps.sh \
+tap-diagnostic.sh \
+tap-empty-diagnostic.sh \
+tap-empty.sh \
+tap-escape-directive.sh \
+tap-escape-directive-2.sh \
+tap-exit.sh \
+tap-signal.tap \
+tap-fancy.sh \
+tap-fancy2.sh \
+tap-global-log.sh \
+tap-global-result.sh \
+tap-log.sh \
+tap-msg0-result.sh \
+tap-msg0-directive.sh \
+tap-msg0-planskip.sh \
+tap-msg0-bailout.sh \
+tap-msg0-misc.sh \
+tap-merge-stdout-stderr.sh \
+tap-no-merge-stdout-stderr.sh \
+tap-no-disable-hard-error.sh \
+tap-no-spurious-summary.sh \
+tap-no-spurious-numbers.sh \
+tap-no-spurious.sh \
+tap-not-ok-skip.sh \
+tap-number-wordboundary.sh \
+tap-numeric-description.sh \
+tap-negative-numbers.sh \
+tap-numbers-leading-zero.sh \
+tap-out-of-order.sh \
+tap-passthrough.sh \
+tap-passthrough-exit.sh \
+tap-plan.sh \
+tap-plan-corner.sh \
+tap-plan-errors.sh \
+tap-plan-middle.sh \
+tap-plan-whitespace.sh \
+tap-plan-leading-zero.sh \
+tap-plan-malformed.sh \
+tap-missing-plan-and-bad-exit.sh \
+tap-planskip.sh \
+tap-planskip-late.sh \
+tap-planskip-and-logging.sh \
+tap-planskip-unplanned.sh \
+tap-planskip-unplanned-corner.sh \
+tap-planskip-case-insensitive.sh \
+tap-planskip-whitespace.sh \
+tap-planskip-badexit.sh \
+tap-planskip-bailout.sh \
+tap-planskip-later-errors.sh \
+tap-realtime.sh \
+tap-test-number-0.sh \
+tap-recheck-logs.sh \
+tap-result-comment.sh \
+tap-todo-skip-together.sh \
+tap-todo-skip-whitespace.sh \
+tap-todo-skip.sh \
+tap-unplanned.sh \
+tap-whitespace-normalization.sh \
+tap-with-and-without-number.sh \
+tap-xfail-tests.sh \
+tap-common-setup.sh \
+tap-bad-prog.tap \
+tap-basic.sh \
+tap-diagnostic-custom.sh \
+tap-driver-stderr.sh \
+tap-doc.sh \
+tap-doc2.sh \
+tap-more.sh \
+tap-more2.sh \
+tap-recheck.sh \
+tap-summary.sh \
+tap-summary-color.sh \
+tags.sh \
+tags2.sh \
+tagsub.sh \
+tar.sh \
+tar2.sh \
+tar3.sh \
+tar-override.sh \
+target-cflags.sh \
+targetclash.sh \
+tests-environment-fd-redirect.sh \
+tests-environment-and-log-compiler.sh \
+txinfo.sh \
+txinfo2.sh \
+txinfo3.sh \
+txinfo4.sh \
+txinfo5.sh \
+txinfo5b.sh \
+txinfo6.sh \
+txinfo7.sh \
+txinfo8.sh \
+txinfo9.sh \
+txinfo10.sh \
+txinfo13.sh \
+txinfo16.sh \
+txinfo17.sh \
+txinfo19.sh \
+txinfo20.sh \
+txinfo21.sh \
+txinfo22.sh \
+txinfo23.sh \
+txinfo24.sh \
+txinfo25.sh \
+txinfo26.sh \
+txinfo27.sh \
+txinfo28.sh \
+txinfo29.sh \
+txinfo30.sh \
+txinfo31.sh \
+txinfo32.sh \
+txinfo33.sh \
+txinfo-no-clutter.sh \
+txinfo-unrecognized-extension.sh \
+transform.sh \
+transform2.sh \
+transform3.sh \
+uninstall-fail.sh \
+uninstall-pr9578.sh \
+unused.sh \
+upc.sh \
+upc2.sh \
+upc3.sh \
+vala.sh \
+vala1.sh \
+vala2.sh \
+vala3.sh \
+vala4.sh \
+vala5.sh \
+vala-vpath.sh \
+vala-mix.sh \
+vala-mix2.sh \
+vars.sh \
+vars3.sh \
+vartar.sh \
+vartypos.sh \
+vartypo2.sh \
+version.sh \
+version2.sh \
+version3.sh \
+version4.sh \
+version6.sh \
+version7.sh \
+version8.sh \
+vpath.sh \
+vtexi.sh \
+vtexi2.sh \
+vtexi3.sh \
+vtexi4.sh \
+warnings-override.sh \
+warnings-precedence.sh \
+warnings-strictness-interactions.sh \
+warnings-unknown.sh \
+warnopts.sh \
+warnings-win-over-strictness.sh \
+warning-groups-win-over-strictness.sh \
+werror.sh \
+werror2.sh \
+werror3.sh \
+werror4.sh \
+whoami.sh \
+xsource.sh \
+yacc.sh \
+yacc2.sh \
+yacc4.sh \
+yacc5.sh \
+yacc7.sh \
+yacc8.sh \
+yaccdry.sh \
+yaccpp.sh \
+yaccvpath.sh \
+yacc-auxdir.sh \
+yacc-basic.sh \
+yacc-cxx.sh \
+yacc-bison-skeleton-cxx.sh \
+yacc-bison-skeleton.sh \
+yacc-clean.sh \
+yacc-clean-cxx.sh \
+yacc-d-basic.sh \
+yacc-d-cxx.sh \
+yacc-d-vpath.sh \
+yacc-deleted-headers.sh \
+yacc-depend.sh \
+yacc-depend2.sh \
+yacc-dist-nobuild-subdir.sh \
+yacc-dist-nobuild.sh \
+yacc-line.sh \
+yacc-mix-c-cxx.sh \
+yacc-nodist.sh \
+yacc-pr204.sh \
+yacc-weirdnames.sh \
+yflags.sh \
+yflags2.sh \
+yflags-cmdline-override.sh \
+yflags-conditional.sh \
+yflags-d-false-positives.sh \
+yflags-force-conditional.sh \
+yflags-force-override.sh \
+yflags-var-expand.sh \
+libtool-macros.sh \
+gettext-macros.sh
+
+print-list-of-tests:
+	@echo $(handwritten_TESTS)
+.PHONY: print-list-of-tests
diff --git a/tests/listval.test b/t/listval.sh
index 5e2f9a64c..5e2f9a64c 100755
--- a/tests/listval.test
+++ b/t/listval.sh
diff --git a/tests/location.test b/t/location.sh
index e496ca6b6..e496ca6b6 100755
--- a/tests/location.test
+++ b/t/location.sh
diff --git a/tests/longlin2.test b/t/longlin2.sh
index 1ba8072f3..1ba8072f3 100755
--- a/tests/longlin2.test
+++ b/t/longlin2.sh
diff --git a/tests/longline.test b/t/longline.sh
index dd5664d31..dd5664d31 100755
--- a/tests/longline.test
+++ b/t/longline.sh
diff --git a/tests/ltcond.test b/t/ltcond.sh
index d5098ea9b..d5098ea9b 100755
--- a/tests/ltcond.test
+++ b/t/ltcond.sh
diff --git a/tests/ltcond2.test b/t/ltcond2.sh
index 4a7239483..4a7239483 100755
--- a/tests/ltcond2.test
+++ b/t/ltcond2.sh
diff --git a/tests/ltconv.test b/t/ltconv.sh
index 19ed8b34b..19ed8b34b 100755
--- a/tests/ltconv.test
+++ b/t/ltconv.sh
diff --git a/tests/ltdeps.test b/t/ltdeps.sh
index 100d045e9..100d045e9 100755
--- a/tests/ltdeps.test
+++ b/t/ltdeps.sh
diff --git a/tests/ltinit.test b/t/ltinit.sh
index 49ddbe0f8..49ddbe0f8 100755
--- a/tests/ltinit.test
+++ b/t/ltinit.sh
diff --git a/tests/ltinstloc.test b/t/ltinstloc.sh
index 690699449..690699449 100755
--- a/tests/ltinstloc.test
+++ b/t/ltinstloc.sh
diff --git a/tests/ltlibobjs.test b/t/ltlibobjs.sh
index 5cdccf09b..5cdccf09b 100755
--- a/tests/ltlibobjs.test
+++ b/t/ltlibobjs.sh
diff --git a/tests/ltlibsrc.test b/t/ltlibsrc.sh
index 11e2a1d56..11e2a1d56 100755
--- a/tests/ltlibsrc.test
+++ b/t/ltlibsrc.sh
diff --git a/tests/ltorder.test b/t/ltorder.sh
index 358e620fe..358e620fe 100755
--- a/tests/ltorder.test
+++ b/t/ltorder.sh
diff --git a/tests/lzma.test b/t/lzma.sh
index 8e78f8683..8e78f8683 100755
--- a/tests/lzma.test
+++ b/t/lzma.sh
diff --git a/tests/m4-inclusion.test b/t/m4-inclusion.sh
index 52dae22a0..52dae22a0 100755
--- a/tests/m4-inclusion.test
+++ b/t/m4-inclusion.sh
diff --git a/tests/maintclean-vpath.test b/t/maintclean-vpath.sh
index 11e97a69f..11e97a69f 100755
--- a/tests/maintclean-vpath.test
+++ b/t/maintclean-vpath.sh
diff --git a/tests/maintclean.test b/t/maintclean.sh
index c5d3d0ef7..c5d3d0ef7 100755
--- a/tests/maintclean.test
+++ b/t/maintclean.sh
diff --git a/tests/maintmode-configure-msg.test b/t/maintmode-configure-msg.sh
index 8a7c45104..8a7c45104 100755
--- a/tests/maintmode-configure-msg.test
+++ b/t/maintmode-configure-msg.sh
diff --git a/tests/make-dryrun.tap b/t/make-dryrun.tap
index 37692059b..37692059b 100755
--- a/tests/make-dryrun.tap
+++ b/t/make-dryrun.tap
diff --git a/tests/make.test b/t/make.sh
index e292e38c7..e292e38c7 100755
--- a/tests/make.test
+++ b/t/make.sh
diff --git a/tests/makefile-deps.test b/t/makefile-deps.sh
index 83f3caeef..83f3caeef 100755
--- a/tests/makefile-deps.test
+++ b/t/makefile-deps.sh
diff --git a/tests/makej.test b/t/makej.sh
index 64c5f28a9..64c5f28a9 100755
--- a/tests/makej.test
+++ b/t/makej.sh
diff --git a/tests/makej2.test b/t/makej2.sh
index 8183887a4..8183887a4 100755
--- a/tests/makej2.test
+++ b/t/makej2.sh
diff --git a/tests/maken.test b/t/maken.sh
index bb6444461..bb6444461 100755
--- a/tests/maken.test
+++ b/t/maken.sh
diff --git a/tests/maken3.test b/t/maken3.sh
index 2018549e5..2018549e5 100755
--- a/tests/maken3.test
+++ b/t/maken3.sh
diff --git a/tests/makevars.test b/t/makevars.sh
index ad18830a2..ad18830a2 100755
--- a/tests/makevars.test
+++ b/t/makevars.sh
diff --git a/tests/man.test b/t/man.sh
index d2e5dd66a..d2e5dd66a 100755
--- a/tests/man.test
+++ b/t/man.sh
diff --git a/tests/man2.test b/t/man2.sh
index 38c399288..38c399288 100755
--- a/tests/man2.test
+++ b/t/man2.sh
diff --git a/tests/man3.test b/t/man3.sh
index a842d38a9..a842d38a9 100755
--- a/tests/man3.test
+++ b/t/man3.sh
diff --git a/tests/man4.test b/t/man4.sh
index c7333b9c2..c7333b9c2 100755
--- a/tests/man4.test
+++ b/t/man4.sh
diff --git a/tests/man5.test b/t/man5.sh
index 674ea03c1..674ea03c1 100755
--- a/tests/man5.test
+++ b/t/man5.sh
diff --git a/tests/man6.test b/t/man6.sh
index 1a7b26751..1a7b26751 100755
--- a/tests/man6.test
+++ b/t/man6.sh
diff --git a/tests/man7.test b/t/man7.sh
index 37bec90ca..37bec90ca 100755
--- a/tests/man7.test
+++ b/t/man7.sh
diff --git a/tests/man8.test b/t/man8.sh
index 14c190b0f..14c190b0f 100755
--- a/tests/man8.test
+++ b/t/man8.sh
diff --git a/tests/mdate.test b/t/mdate.sh
index b33bf638b..b33bf638b 100755
--- a/tests/mdate.test
+++ b/t/mdate.sh
diff --git a/tests/mdate2.test b/t/mdate2.sh
index 093de5ea9..093de5ea9 100755
--- a/tests/mdate2.test
+++ b/t/mdate2.sh
diff --git a/tests/mdate3.test b/t/mdate3.sh
index a37e60b79..a37e60b79 100755
--- a/tests/mdate3.test
+++ b/t/mdate3.sh
diff --git a/tests/mdate4.test b/t/mdate4.sh
index ac1be3a38..ac1be3a38 100755
--- a/tests/mdate4.test
+++ b/t/mdate4.sh
diff --git a/tests/mdate5.test b/t/mdate5.sh
index 4cef9526d..4cef9526d 100755
--- a/tests/mdate5.test
+++ b/t/mdate5.sh
diff --git a/tests/mdate6.test b/t/mdate6.sh
index ca3ca21ea..ca3ca21ea 100755
--- a/tests/mdate6.test
+++ b/t/mdate6.sh
diff --git a/tests/missing-auxfile-stops-makefiles-creation.test b/t/missing-auxfile-stops-makefiles-creation.sh
index d7080818d..d7080818d 100755
--- a/tests/missing-auxfile-stops-makefiles-creation.test
+++ b/t/missing-auxfile-stops-makefiles-creation.sh
diff --git a/tests/missing.test b/t/missing.sh
index 473d0412c..473d0412c 100755
--- a/tests/missing.test
+++ b/t/missing.sh
diff --git a/tests/missing2.test b/t/missing2.sh
index 89e9a5daf..89e9a5daf 100755
--- a/tests/missing2.test
+++ b/t/missing2.sh
diff --git a/tests/missing3.test b/t/missing3.sh
index a26f954c9..a26f954c9 100755
--- a/tests/missing3.test
+++ b/t/missing3.sh
diff --git a/tests/missing4.test b/t/missing4.sh
index 01321c349..01321c349 100755
--- a/tests/missing4.test
+++ b/t/missing4.sh
diff --git a/tests/missing5.test b/t/missing5.sh
index 80bba3691..80bba3691 100755
--- a/tests/missing5.test
+++ b/t/missing5.sh
diff --git a/tests/missing6.test b/t/missing6.sh
index 8173f818a..8173f818a 100755
--- a/tests/missing6.test
+++ b/t/missing6.sh
diff --git a/tests/mkinst2.test b/t/mkinst2.sh
index 658283600..658283600 100755
--- a/tests/mkinst2.test
+++ b/t/mkinst2.sh
diff --git a/tests/mkinst3.test b/t/mkinst3.sh
index fbe01c652..fbe01c652 100755
--- a/tests/mkinst3.test
+++ b/t/mkinst3.sh
diff --git a/tests/mkinstall.test b/t/mkinstall.sh
index e6b3bc22a..e6b3bc22a 100755
--- a/tests/mkinstall.test
+++ b/t/mkinstall.sh
diff --git a/tests/mmode.test b/t/mmode.sh
index 6c8039955..6c8039955 100755
--- a/tests/mmode.test
+++ b/t/mmode.sh
diff --git a/tests/mmodely.test b/t/mmodely.sh
index 6c6191520..6c6191520 100755
--- a/tests/mmodely.test
+++ b/t/mmodely.sh
diff --git a/tests/multlib.test b/t/multlib.sh
index b7ddf200e..b7ddf200e 100755
--- a/tests/multlib.test
+++ b/t/multlib.sh
diff --git a/tests/no-extra-makefile-code.test b/t/no-extra-makefile-code.sh
index 1742dc433..1742dc433 100755
--- a/tests/no-extra-makefile-code.test
+++ b/t/no-extra-makefile-code.sh
diff --git a/tests/no-outdir-option.test b/t/no-outdir-option.sh
index 621253479..621253479 100755
--- a/tests/no-outdir-option.test
+++ b/t/no-outdir-option.sh
diff --git a/tests/nobase-libtool.test b/t/nobase-libtool.sh
index 38008cd0a..38008cd0a 100755
--- a/tests/nobase-libtool.test
+++ b/t/nobase-libtool.sh
diff --git a/tests/nobase-nodist.test b/t/nobase-nodist.sh
index 54b940b9b..54b940b9b 100755
--- a/tests/nobase-nodist.test
+++ b/t/nobase-nodist.sh
diff --git a/tests/nobase-python.test b/t/nobase-python.sh
index 28509018b..28509018b 100755
--- a/tests/nobase-python.test
+++ b/t/nobase-python.sh
diff --git a/tests/nobase.test b/t/nobase.sh
index e7661c09a..e7661c09a 100755
--- a/tests/nobase.test
+++ b/t/nobase.sh
diff --git a/tests/nodef.test b/t/nodef.sh
index 3c55745b3..3c55745b3 100755
--- a/tests/nodef.test
+++ b/t/nodef.sh
diff --git a/tests/nodef2.test b/t/nodef2.sh
index 1af7b0d36..1af7b0d36 100755
--- a/tests/nodef2.test
+++ b/t/nodef2.sh
diff --git a/tests/nodep.test b/t/nodep.sh
index 5dcad1ce9..5dcad1ce9 100755
--- a/tests/nodep.test
+++ b/t/nodep.sh
diff --git a/tests/nodep2.test b/t/nodep2.sh
index edf0fa9da..edf0fa9da 100755
--- a/tests/nodep2.test
+++ b/t/nodep2.sh
diff --git a/tests/nodepcomp.test b/t/nodepcomp.sh
index 4691efa91..4691efa91 100755
--- a/tests/nodepcomp.test
+++ b/t/nodepcomp.sh
diff --git a/tests/nodist.test b/t/nodist.sh
index 92cc2f75a..92cc2f75a 100755
--- a/tests/nodist.test
+++ b/t/nodist.sh
diff --git a/tests/nodist2.test b/t/nodist2.sh
index 36851be90..36851be90 100755
--- a/tests/nodist2.test
+++ b/t/nodist2.sh
diff --git a/tests/nodist3.test b/t/nodist3.sh
index 23becc12d..23becc12d 100755
--- a/tests/nodist3.test
+++ b/t/nodist3.sh
diff --git a/tests/noinst.test b/t/noinst.sh
index 887c7a73c..887c7a73c 100755
--- a/tests/noinst.test
+++ b/t/noinst.sh
diff --git a/tests/noinstdir.test b/t/noinstdir.sh
index 39abdc7e2..39abdc7e2 100755
--- a/tests/noinstdir.test
+++ b/t/noinstdir.sh
diff --git a/tests/nolink.test b/t/nolink.sh
index dea627127..dea627127 100755
--- a/tests/nolink.test
+++ b/t/nolink.sh
diff --git a/tests/nostdinc.test b/t/nostdinc.sh
index 8b780a6e5..8b780a6e5 100755
--- a/tests/nostdinc.test
+++ b/t/nostdinc.sh
diff --git a/tests/notrans.test b/t/notrans.sh
index 487b66f3d..487b66f3d 100755
--- a/tests/notrans.test
+++ b/t/notrans.sh
diff --git a/tests/number.test b/t/number.sh
index b96e1180d..b96e1180d 100755
--- a/tests/number.test
+++ b/t/number.sh
diff --git a/tests/objc.test b/t/objc.sh
index f56c76d8c..f56c76d8c 100755
--- a/tests/objc.test
+++ b/t/objc.sh
diff --git a/tests/objc2.test b/t/objc2.sh
index 290bf2642..290bf2642 100755
--- a/tests/objc2.test
+++ b/t/objc2.sh
diff --git a/tests/objext-pr10128.test b/t/objext-pr10128.sh
index 2fe2dfd2c..2fe2dfd2c 100755
--- a/tests/objext-pr10128.test
+++ b/t/objext-pr10128.sh
diff --git a/tests/obsolete.test b/t/obsolete.sh
index c4240c200..c4240c200 100755
--- a/tests/obsolete.test
+++ b/t/obsolete.sh
diff --git a/tests/oldvars.test b/t/oldvars.sh
index 87d9cf1fa..87d9cf1fa 100755
--- a/tests/oldvars.test
+++ b/t/oldvars.sh
diff --git a/tests/order.test b/t/order.sh
index 238340346..238340346 100755
--- a/tests/order.test
+++ b/t/order.sh
diff --git a/tests/output-order.test b/t/output-order.sh
index 879b678c3..879b678c3 100755
--- a/tests/output-order.test
+++ b/t/output-order.sh
diff --git a/tests/output.test b/t/output.sh
index faf877ba5..faf877ba5 100755
--- a/tests/output.test
+++ b/t/output.sh
diff --git a/tests/output10.test b/t/output10.sh
index 92492f692..92492f692 100755
--- a/tests/output10.test
+++ b/t/output10.sh
diff --git a/tests/output11.test b/t/output11.sh
index 4413f9732..4413f9732 100755
--- a/tests/output11.test
+++ b/t/output11.sh
diff --git a/tests/output12.test b/t/output12.sh
index a3693cc29..a3693cc29 100755
--- a/tests/output12.test
+++ b/t/output12.sh
diff --git a/tests/output13.test b/t/output13.sh
index 065bdb5cb..065bdb5cb 100755
--- a/tests/output13.test
+++ b/t/output13.sh
diff --git a/tests/output2.test b/t/output2.sh
index 41c81bfe7..41c81bfe7 100755
--- a/tests/output2.test
+++ b/t/output2.sh
diff --git a/tests/output3.test b/t/output3.sh
index dd7aaefe7..dd7aaefe7 100755
--- a/tests/output3.test
+++ b/t/output3.sh
diff --git a/tests/output4.test b/t/output4.sh
index fa6a95ea5..fa6a95ea5 100755
--- a/tests/output4.test
+++ b/t/output4.sh
diff --git a/tests/output5.test b/t/output5.sh
index 8bf9403a2..8bf9403a2 100755
--- a/tests/output5.test
+++ b/t/output5.sh
diff --git a/tests/output6.test b/t/output6.sh
index b55f5e327..b55f5e327 100755
--- a/tests/output6.test
+++ b/t/output6.sh
diff --git a/tests/output7.test b/t/output7.sh
index 0f4725fae..0f4725fae 100755
--- a/tests/output7.test
+++ b/t/output7.sh
diff --git a/tests/output8.test b/t/output8.sh
index 1339c67dd..1339c67dd 100755
--- a/tests/output8.test
+++ b/t/output8.sh
diff --git a/tests/output9.test b/t/output9.sh
index f0759108c..f0759108c 100755
--- a/tests/output9.test
+++ b/t/output9.sh
diff --git a/tests/override-conditional-1.test b/t/override-conditional-1.sh
index 1f66d3f47..1f66d3f47 100755
--- a/tests/override-conditional-1.test
+++ b/t/override-conditional-1.sh
diff --git a/tests/override-conditional-2.test b/t/override-conditional-2.sh
index 4f0688832..4f0688832 100755
--- a/tests/override-conditional-2.test
+++ b/t/override-conditional-2.sh
diff --git a/tests/override-html.test b/t/override-html.sh
index 6438c998b..6438c998b 100755
--- a/tests/override-html.test
+++ b/t/override-html.sh
diff --git a/tests/override-suggest-local.test b/t/override-suggest-local.sh
index 286c8881b..286c8881b 100755
--- a/tests/override-suggest-local.test
+++ b/t/override-suggest-local.sh
diff --git a/tests/parallel-am.test b/t/parallel-am.sh
index db184b283..db184b283 100755
--- a/tests/parallel-am.test
+++ b/t/parallel-am.sh
diff --git a/tests/parallel-am2.test b/t/parallel-am2.sh
index a8ee1b955..a8ee1b955 100755
--- a/tests/parallel-am2.test
+++ b/t/parallel-am2.sh
diff --git a/tests/parallel-am3.test b/t/parallel-am3.sh
index d6302907e..d6302907e 100755
--- a/tests/parallel-am3.test
+++ b/t/parallel-am3.sh
diff --git a/tests/parallel-tests-cmdline-override.test b/t/parallel-tests-cmdline-override.sh
index 86b0c94ef..86b0c94ef 100755
--- a/tests/parallel-tests-cmdline-override.test
+++ b/t/parallel-tests-cmdline-override.sh
diff --git a/tests/parallel-tests-console-output.test b/t/parallel-tests-console-output.sh
index ac43b2537..ac43b2537 100755
--- a/tests/parallel-tests-console-output.test
+++ b/t/parallel-tests-console-output.sh
diff --git a/tests/parallel-tests-driver-install.test b/t/parallel-tests-driver-install.sh
index b538799e0..b538799e0 100755
--- a/tests/parallel-tests-driver-install.test
+++ b/t/parallel-tests-driver-install.sh
diff --git a/tests/parallel-tests-dry-run-1.test b/t/parallel-tests-dry-run-1.sh
index b094c1841..b094c1841 100755
--- a/tests/parallel-tests-dry-run-1.test
+++ b/t/parallel-tests-dry-run-1.sh
diff --git a/tests/parallel-tests-dry-run-2.test b/t/parallel-tests-dry-run-2.sh
index 0d13677c2..0d13677c2 100755
--- a/tests/parallel-tests-dry-run-2.test
+++ b/t/parallel-tests-dry-run-2.sh
diff --git a/tests/parallel-tests-empty-testlogs.test b/t/parallel-tests-empty-testlogs.sh
index 0ea6db837..0ea6db837 100755
--- a/tests/parallel-tests-empty-testlogs.test
+++ b/t/parallel-tests-empty-testlogs.sh
diff --git a/tests/parallel-tests-exeext.test b/t/parallel-tests-exeext.sh
index e93f5f10d..e93f5f10d 100755
--- a/tests/parallel-tests-exeext.test
+++ b/t/parallel-tests-exeext.sh
diff --git a/tests/parallel-tests-exit-statuses.test b/t/parallel-tests-exit-statuses.sh
index 688ff8447..688ff8447 100755
--- a/tests/parallel-tests-exit-statuses.test
+++ b/t/parallel-tests-exit-statuses.sh
diff --git a/tests/parallel-tests-extra-programs.test b/t/parallel-tests-extra-programs.sh
index d95d18476..d95d18476 100755
--- a/tests/parallel-tests-extra-programs.test
+++ b/t/parallel-tests-extra-programs.sh
diff --git a/tests/parallel-tests-fd-redirect-exeext.test b/t/parallel-tests-fd-redirect-exeext.sh
index 56d7f5990..56d7f5990 100755
--- a/tests/parallel-tests-fd-redirect-exeext.test
+++ b/t/parallel-tests-fd-redirect-exeext.sh
diff --git a/tests/parallel-tests-fd-redirect.test b/t/parallel-tests-fd-redirect.sh
index cf7acce10..cf7acce10 100755
--- a/tests/parallel-tests-fd-redirect.test
+++ b/t/parallel-tests-fd-redirect.sh
diff --git a/tests/parallel-tests-fork-bomb.test b/t/parallel-tests-fork-bomb.sh
index 2f0016bc1..2f0016bc1 100755
--- a/tests/parallel-tests-fork-bomb.test
+++ b/t/parallel-tests-fork-bomb.sh
diff --git a/tests/parallel-tests-harderror.test b/t/parallel-tests-harderror.sh
index 7b6625190..7b6625190 100755
--- a/tests/parallel-tests-harderror.test
+++ b/t/parallel-tests-harderror.sh
diff --git a/tests/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
index 39a04a753..39a04a753 100755
--- a/tests/parallel-tests-interrupt.tap
+++ b/t/parallel-tests-interrupt.tap
diff --git a/tests/parallel-tests-log-compiler-1.test b/t/parallel-tests-log-compiler-1.sh
index 77bdac406..77bdac406 100755
--- a/tests/parallel-tests-log-compiler-1.test
+++ b/t/parallel-tests-log-compiler-1.sh
diff --git a/tests/parallel-tests-log-compiler-2.test b/t/parallel-tests-log-compiler-2.sh
index 7443e263f..7443e263f 100755
--- a/tests/parallel-tests-log-compiler-2.test
+++ b/t/parallel-tests-log-compiler-2.sh
diff --git a/tests/parallel-tests-log-compiler-example.test b/t/parallel-tests-log-compiler-example.sh
index 8b4575861..8b4575861 100755
--- a/tests/parallel-tests-log-compiler-example.test
+++ b/t/parallel-tests-log-compiler-example.sh
diff --git a/tests/parallel-tests-log-override-1.test b/t/parallel-tests-log-override-1.sh
index f76d193cc..f76d193cc 100755
--- a/tests/parallel-tests-log-override-1.test
+++ b/t/parallel-tests-log-override-1.sh
diff --git a/tests/parallel-tests-log-override-2.test b/t/parallel-tests-log-override-2.sh
index ca0b59fbb..ca0b59fbb 100755
--- a/tests/parallel-tests-log-override-2.test
+++ b/t/parallel-tests-log-override-2.sh
diff --git a/tests/parallel-tests-log-override-recheck.test b/t/parallel-tests-log-override-recheck.sh
index c7c1b2b39..c7c1b2b39 100755
--- a/tests/parallel-tests-log-override-recheck.test
+++ b/t/parallel-tests-log-override-recheck.sh
diff --git a/tests/parallel-tests-many.test b/t/parallel-tests-many.sh
index a09dbe518..a09dbe518 100755
--- a/tests/parallel-tests-many.test
+++ b/t/parallel-tests-many.sh
diff --git a/tests/parallel-tests-no-color-in-log.test b/t/parallel-tests-no-color-in-log.sh
index 17115b943..17115b943 100755
--- a/tests/parallel-tests-no-color-in-log.test
+++ b/t/parallel-tests-no-color-in-log.sh
diff --git a/tests/parallel-tests-no-spurious-summary.test b/t/parallel-tests-no-spurious-summary.sh
index 62b4ef64c..62b4ef64c 100755
--- a/tests/parallel-tests-no-spurious-summary.test
+++ b/t/parallel-tests-no-spurious-summary.sh
diff --git a/tests/parallel-tests-once.test b/t/parallel-tests-once.sh
index 53ee677fb..53ee677fb 100755
--- a/tests/parallel-tests-once.test
+++ b/t/parallel-tests-once.sh
diff --git a/tests/parallel-tests-reset-term.test b/t/parallel-tests-reset-term.sh
index 6307f6e4b..6307f6e4b 100755
--- a/tests/parallel-tests-reset-term.test
+++ b/t/parallel-tests-reset-term.sh
diff --git a/tests/parallel-tests-subdir.test b/t/parallel-tests-subdir.sh
index 6848edbd8..6848edbd8 100755
--- a/tests/parallel-tests-subdir.test
+++ b/t/parallel-tests-subdir.sh
diff --git a/tests/parallel-tests-suffix-prog.test b/t/parallel-tests-suffix-prog.sh
index abd4a5c42..abd4a5c42 100755
--- a/tests/parallel-tests-suffix-prog.test
+++ b/t/parallel-tests-suffix-prog.sh
diff --git a/tests/parallel-tests-suffix.test b/t/parallel-tests-suffix.sh
index bd72d0d57..bd72d0d57 100755
--- a/tests/parallel-tests-suffix.test
+++ b/t/parallel-tests-suffix.sh
diff --git a/tests/parallel-tests-trailing-bslash.test b/t/parallel-tests-trailing-bslash.sh
index 4b3bdf847..4b3bdf847 100755
--- a/tests/parallel-tests-trailing-bslash.test
+++ b/t/parallel-tests-trailing-bslash.sh
diff --git a/tests/parallel-tests-unreadable.test b/t/parallel-tests-unreadable.sh
index 7ddb9db5b..7ddb9db5b 100755
--- a/tests/parallel-tests-unreadable.test
+++ b/t/parallel-tests-unreadable.sh
diff --git a/tests/parallel-tests.test b/t/parallel-tests.sh
index 891d7bd80..891d7bd80 100755
--- a/tests/parallel-tests.test
+++ b/t/parallel-tests.sh
diff --git a/tests/parallel-tests10.test b/t/parallel-tests10.sh
index 239648263..239648263 100755
--- a/tests/parallel-tests10.test
+++ b/t/parallel-tests10.sh
diff --git a/tests/parallel-tests2.test b/t/parallel-tests2.sh
index 7b6933a5d..7b6933a5d 100755
--- a/tests/parallel-tests2.test
+++ b/t/parallel-tests2.sh
diff --git a/tests/parallel-tests3.test b/t/parallel-tests3.sh
index f06d0939e..f06d0939e 100755
--- a/tests/parallel-tests3.test
+++ b/t/parallel-tests3.sh
diff --git a/tests/parallel-tests5.test b/t/parallel-tests5.sh
index 9f0a9669e..9f0a9669e 100755
--- a/tests/parallel-tests5.test
+++ b/t/parallel-tests5.sh
diff --git a/tests/parallel-tests6.test b/t/parallel-tests6.sh
index eee653810..eee653810 100755
--- a/tests/parallel-tests6.test
+++ b/t/parallel-tests6.sh
diff --git a/tests/parallel-tests8.test b/t/parallel-tests8.sh
index 8e35b6b61..8e35b6b61 100755
--- a/tests/parallel-tests8.test
+++ b/t/parallel-tests8.sh
diff --git a/tests/parallel-tests9.test b/t/parallel-tests9.sh
index f22be8d73..f22be8d73 100755
--- a/tests/parallel-tests9.test
+++ b/t/parallel-tests9.sh
diff --git a/tests/parse.test b/t/parse.sh
index 20ac2fedc..20ac2fedc 100755
--- a/tests/parse.test
+++ b/t/parse.sh
diff --git a/tests/percent.test b/t/percent.sh
index bdba44ede..bdba44ede 100755
--- a/tests/percent.test
+++ b/t/percent.sh
diff --git a/tests/percent2.test b/t/percent2.sh
index 19af61a52..19af61a52 100755
--- a/tests/percent2.test
+++ b/t/percent2.sh
diff --git a/tests/phony.test b/t/phony.sh
index a818cfb70..a818cfb70 100755
--- a/tests/phony.test
+++ b/t/phony.sh
diff --git a/tests/pluseq.test b/t/pluseq.sh
index 7a8df81da..7a8df81da 100755
--- a/tests/pluseq.test
+++ b/t/pluseq.sh
diff --git a/tests/pluseq10.test b/t/pluseq10.sh
index e9ce944a0..e9ce944a0 100755
--- a/tests/pluseq10.test
+++ b/t/pluseq10.sh
diff --git a/tests/pluseq11.test b/t/pluseq11.sh
index 4c0b8886c..4c0b8886c 100755
--- a/tests/pluseq11.test
+++ b/t/pluseq11.sh
diff --git a/tests/pluseq2.test b/t/pluseq2.sh
index 102076a6d..102076a6d 100755
--- a/tests/pluseq2.test
+++ b/t/pluseq2.sh
diff --git a/tests/pluseq3.test b/t/pluseq3.sh
index fc7a496a0..fc7a496a0 100755
--- a/tests/pluseq3.test
+++ b/t/pluseq3.sh
diff --git a/tests/pluseq4.test b/t/pluseq4.sh
index 59c82d855..59c82d855 100755
--- a/tests/pluseq4.test
+++ b/t/pluseq4.sh
diff --git a/tests/pluseq5.test b/t/pluseq5.sh
index 5db9c47b3..5db9c47b3 100755
--- a/tests/pluseq5.test
+++ b/t/pluseq5.sh
diff --git a/tests/pluseq6.test b/t/pluseq6.sh
index 7a8f18706..7a8f18706 100755
--- a/tests/pluseq6.test
+++ b/t/pluseq6.sh
diff --git a/tests/pluseq7.test b/t/pluseq7.sh
index 7f5a32ec3..7f5a32ec3 100755
--- a/tests/pluseq7.test
+++ b/t/pluseq7.sh
diff --git a/tests/pluseq8.test b/t/pluseq8.sh
index 724e4d510..724e4d510 100755
--- a/tests/pluseq8.test
+++ b/t/pluseq8.sh
diff --git a/tests/pluseq9.test b/t/pluseq9.sh
index f3c802158..f3c802158 100755
--- a/tests/pluseq9.test
+++ b/t/pluseq9.sh
diff --git a/tests/pm/Cond2.pl b/t/pm/Cond2.pl
index 2bed02826..2bed02826 100644
--- a/tests/pm/Cond2.pl
+++ b/t/pm/Cond2.pl
diff --git a/tests/pm/Cond3.pl b/t/pm/Cond3.pl
index 518eea84d..518eea84d 100644
--- a/tests/pm/Cond3.pl
+++ b/t/pm/Cond3.pl
diff --git a/tests/pm/Condition-t.pl b/t/pm/Condition-t.pl
index d29407add..d29407add 100644
--- a/tests/pm/Condition-t.pl
+++ b/t/pm/Condition-t.pl
diff --git a/tests/pm/Condition.pl b/t/pm/Condition.pl
index 5041a843e..5041a843e 100644
--- a/tests/pm/Condition.pl
+++ b/t/pm/Condition.pl
diff --git a/tests/pm/DisjCon2.pl b/t/pm/DisjCon2.pl
index 2d287493d..2d287493d 100644
--- a/tests/pm/DisjCon2.pl
+++ b/t/pm/DisjCon2.pl
diff --git a/tests/pm/DisjCon3.pl b/t/pm/DisjCon3.pl
index ede5ab7ac..ede5ab7ac 100644
--- a/tests/pm/DisjCon3.pl
+++ b/t/pm/DisjCon3.pl
diff --git a/tests/pm/DisjConditions-t.pl b/t/pm/DisjConditions-t.pl
index b49ae2e59..b49ae2e59 100644
--- a/tests/pm/DisjConditions-t.pl
+++ b/t/pm/DisjConditions-t.pl
diff --git a/tests/pm/DisjConditions.pl b/t/pm/DisjConditions.pl
index e7c977534..e7c977534 100644
--- a/tests/pm/DisjConditions.pl
+++ b/t/pm/DisjConditions.pl
diff --git a/tests/pm/Version.pl b/t/pm/Version.pl
index 293badcd1..293badcd1 100644
--- a/tests/pm/Version.pl
+++ b/t/pm/Version.pl
diff --git a/tests/pm/Version2.pl b/t/pm/Version2.pl
index b452e475d..b452e475d 100644
--- a/tests/pm/Version2.pl
+++ b/t/pm/Version2.pl
diff --git a/tests/pm/Version3.pl b/t/pm/Version3.pl
index 2f7d41375..2f7d41375 100644
--- a/tests/pm/Version3.pl
+++ b/t/pm/Version3.pl
diff --git a/tests/pm/Wrap.pl b/t/pm/Wrap.pl
index a929a6a44..a929a6a44 100644
--- a/tests/pm/Wrap.pl
+++ b/t/pm/Wrap.pl
diff --git a/tests/posixsubst-data.test b/t/posixsubst-data.sh
index c2c2d7e3e..c2c2d7e3e 100755
--- a/tests/posixsubst-data.test
+++ b/t/posixsubst-data.sh
diff --git a/tests/posixsubst-extradist.test b/t/posixsubst-extradist.sh
index 7e3cf2f54..7e3cf2f54 100755
--- a/tests/posixsubst-extradist.test
+++ b/t/posixsubst-extradist.sh
diff --git a/tests/posixsubst-ldadd.test b/t/posixsubst-ldadd.sh
index f1cc55b36..f1cc55b36 100755
--- a/tests/posixsubst-ldadd.test
+++ b/t/posixsubst-ldadd.sh
diff --git a/tests/posixsubst-libraries.test b/t/posixsubst-libraries.sh
index 8e6b26521..8e6b26521 100755
--- a/tests/posixsubst-libraries.test
+++ b/t/posixsubst-libraries.sh
diff --git a/tests/posixsubst-ltlibraries.test b/t/posixsubst-ltlibraries.sh
index 6a4cbd551..6a4cbd551 100755
--- a/tests/posixsubst-ltlibraries.test
+++ b/t/posixsubst-ltlibraries.sh
diff --git a/tests/posixsubst-programs.test b/t/posixsubst-programs.sh
index a02cb9209..a02cb9209 100755
--- a/tests/posixsubst-programs.test
+++ b/t/posixsubst-programs.sh
diff --git a/tests/posixsubst-scripts.test b/t/posixsubst-scripts.sh
index 934b82eb4..934b82eb4 100755
--- a/tests/posixsubst-scripts.test
+++ b/t/posixsubst-scripts.sh
diff --git a/tests/posixsubst-sources.test b/t/posixsubst-sources.sh
index ccd61b9b4..ccd61b9b4 100755
--- a/tests/posixsubst-sources.test
+++ b/t/posixsubst-sources.sh
diff --git a/tests/posixsubst-tests.test b/t/posixsubst-tests.sh
index 27a451dbf..27a451dbf 100755
--- a/tests/posixsubst-tests.test
+++ b/t/posixsubst-tests.sh
diff --git a/tests/postproc.test b/t/postproc.sh
index 7eaa4f871..7eaa4f871 100755
--- a/tests/postproc.test
+++ b/t/postproc.sh
diff --git a/tests/ppf77.test b/t/ppf77.sh
index 70266d639..70266d639 100755
--- a/tests/ppf77.test
+++ b/t/ppf77.sh
diff --git a/tests/pr2.test b/t/pr2.sh
index ffe4a81d7..ffe4a81d7 100755
--- a/tests/pr2.test
+++ b/t/pr2.sh
diff --git a/tests/pr211.test b/t/pr211.sh
index 97e28ebc2..97e28ebc2 100755
--- a/tests/pr211.test
+++ b/t/pr211.sh
diff --git a/tests/pr220.test b/t/pr220.sh
index 657221d2f..657221d2f 100755
--- a/tests/pr220.test
+++ b/t/pr220.sh
diff --git a/tests/pr224.test b/t/pr224.sh
index 51e3c1723..51e3c1723 100755
--- a/tests/pr224.test
+++ b/t/pr224.sh
diff --git a/tests/pr229.test b/t/pr229.sh
index cacdb824a..cacdb824a 100755
--- a/tests/pr229.test
+++ b/t/pr229.sh
diff --git a/tests/pr243.test b/t/pr243.sh
index 01ba6447f..01ba6447f 100755
--- a/tests/pr243.test
+++ b/t/pr243.sh
diff --git a/tests/pr266.test b/t/pr266.sh
index ac5687894..ac5687894 100755
--- a/tests/pr266.test
+++ b/t/pr266.sh
diff --git a/tests/pr279-2.test b/t/pr279-2.sh
index 5618d7625..5618d7625 100755
--- a/tests/pr279-2.test
+++ b/t/pr279-2.sh
diff --git a/tests/pr279.test b/t/pr279.sh
index 338313184..338313184 100755
--- a/tests/pr279.test
+++ b/t/pr279.sh
diff --git a/tests/pr287.test b/t/pr287.sh
index 681f6d61b..681f6d61b 100755
--- a/tests/pr287.test
+++ b/t/pr287.sh
diff --git a/tests/pr300-lib.test b/t/pr300-lib.sh
index b655cf013..b655cf013 100755
--- a/tests/pr300-lib.test
+++ b/t/pr300-lib.sh
diff --git a/tests/pr300-ltlib.test b/t/pr300-ltlib.sh
index 8db6b0792..8db6b0792 100755
--- a/tests/pr300-ltlib.test
+++ b/t/pr300-ltlib.sh
diff --git a/tests/pr300-prog.test b/t/pr300-prog.sh
index 6812231bd..6812231bd 100755
--- a/tests/pr300-prog.test
+++ b/t/pr300-prog.sh
diff --git a/tests/pr307.test b/t/pr307.sh
index abcff807d..abcff807d 100755
--- a/tests/pr307.test
+++ b/t/pr307.sh
diff --git a/tests/pr401.test b/t/pr401.sh
index a14349849..a14349849 100755
--- a/tests/pr401.test
+++ b/t/pr401.sh
diff --git a/tests/pr401b.test b/t/pr401b.sh
index 3d15671c2..3d15671c2 100755
--- a/tests/pr401b.test
+++ b/t/pr401b.sh
diff --git a/tests/pr401c.test b/t/pr401c.sh
index 1f238f615..1f238f615 100755
--- a/tests/pr401c.test
+++ b/t/pr401c.sh
diff --git a/tests/pr72.test b/t/pr72.sh
index b16e8792f..b16e8792f 100755
--- a/tests/pr72.test
+++ b/t/pr72.sh
diff --git a/tests/pr8365-remake-timing.test b/t/pr8365-remake-timing.sh
index 2feaf6df2..2feaf6df2 100755
--- a/tests/pr8365-remake-timing.test
+++ b/t/pr8365-remake-timing.sh
diff --git a/tests/pr87.test b/t/pr87.sh
index d98b66152..d98b66152 100755
--- a/tests/pr87.test
+++ b/t/pr87.sh
diff --git a/tests/pr9.test b/t/pr9.sh
index 36a9f7e95..36a9f7e95 100755
--- a/tests/pr9.test
+++ b/t/pr9.sh
diff --git a/tests/prefix.test b/t/prefix.sh
index 26c088a0e..26c088a0e 100755
--- a/tests/prefix.test
+++ b/t/prefix.sh
diff --git a/tests/primary-prefix-couples-documented-valid.test b/t/primary-prefix-couples-documented-valid.sh
index 7b0021abb..7b0021abb 100755
--- a/tests/primary-prefix-couples-documented-valid.test
+++ b/t/primary-prefix-couples-documented-valid.sh
diff --git a/tests/primary-prefix-couples-force-valid.test b/t/primary-prefix-couples-force-valid.sh
index 064db2bbb..064db2bbb 100755
--- a/tests/primary-prefix-couples-force-valid.test
+++ b/t/primary-prefix-couples-force-valid.sh
diff --git a/tests/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
index 407c8738f..407c8738f 100755
--- a/tests/primary-prefix-invalid-couples.tap
+++ b/t/primary-prefix-invalid-couples.tap
diff --git a/tests/primary-prefix-valid-couples.test b/t/primary-prefix-valid-couples.sh
index 989ca4bad..989ca4bad 100755
--- a/tests/primary-prefix-valid-couples.test
+++ b/t/primary-prefix-valid-couples.sh
diff --git a/tests/primary.test b/t/primary.sh
index e1a8f444f..e1a8f444f 100755
--- a/tests/primary.test
+++ b/t/primary.sh
diff --git a/tests/primary2.test b/t/primary2.sh
index f9417d8f3..f9417d8f3 100755
--- a/tests/primary2.test
+++ b/t/primary2.sh
diff --git a/tests/primary3.test b/t/primary3.sh
index 80dab29e2..80dab29e2 100755
--- a/tests/primary3.test
+++ b/t/primary3.sh
diff --git a/tests/print-libdir.test b/t/print-libdir.sh
index f5764b368..f5764b368 100755
--- a/tests/print-libdir.test
+++ b/t/print-libdir.sh
diff --git a/tests/proginst.test b/t/proginst.sh
index 4008b4743..4008b4743 100755
--- a/tests/proginst.test
+++ b/t/proginst.sh
diff --git a/tests/programs-primary-rewritten.test b/t/programs-primary-rewritten.sh
index 7de6d99bf..7de6d99bf 100755
--- a/tests/programs-primary-rewritten.test
+++ b/t/programs-primary-rewritten.sh
diff --git a/tests/py-compile-basedir.test b/t/py-compile-basedir.sh
index 1504f557e..1504f557e 100755
--- a/tests/py-compile-basedir.test
+++ b/t/py-compile-basedir.sh
diff --git a/tests/py-compile-basic.test b/t/py-compile-basic.sh
index 5fa3bf68f..5fa3bf68f 100755
--- a/tests/py-compile-basic.test
+++ b/t/py-compile-basic.sh
diff --git a/tests/py-compile-basic2.test b/t/py-compile-basic2.sh
index dfa992c15..dfa992c15 100755
--- a/tests/py-compile-basic2.test
+++ b/t/py-compile-basic2.sh
diff --git a/tests/py-compile-destdir.test b/t/py-compile-destdir.sh
index ab3fe7779..ab3fe7779 100755
--- a/tests/py-compile-destdir.test
+++ b/t/py-compile-destdir.sh
diff --git a/tests/py-compile-env.test b/t/py-compile-env.sh
index 5dd7e5f5c..5dd7e5f5c 100755
--- a/tests/py-compile-env.test
+++ b/t/py-compile-env.sh
diff --git a/tests/py-compile-option-terminate.test b/t/py-compile-option-terminate.sh
index f54ffc756..f54ffc756 100755
--- a/tests/py-compile-option-terminate.test
+++ b/t/py-compile-option-terminate.sh
diff --git a/tests/py-compile-usage.test b/t/py-compile-usage.sh
index 19883b03d..19883b03d 100755
--- a/tests/py-compile-usage.test
+++ b/t/py-compile-usage.sh
diff --git a/tests/python-dist.test b/t/python-dist.sh
index 25dd4fe8b..25dd4fe8b 100755
--- a/tests/python-dist.test
+++ b/t/python-dist.sh
diff --git a/tests/python-pr10995.test b/t/python-pr10995.sh
index b21d38f0c..b21d38f0c 100755
--- a/tests/python-pr10995.test
+++ b/t/python-pr10995.sh
diff --git a/tests/python-vars.test b/t/python-vars.sh
index 56c2b619f..56c2b619f 100755
--- a/tests/python-vars.test
+++ b/t/python-vars.sh
diff --git a/tests/python-virtualenv.test b/t/python-virtualenv.sh
index c534e8da4..c534e8da4 100755
--- a/tests/python-virtualenv.test
+++ b/t/python-virtualenv.sh
diff --git a/tests/python.test b/t/python.sh
index de8c0bbfb..de8c0bbfb 100755
--- a/tests/python.test
+++ b/t/python.sh
diff --git a/tests/python10.test b/t/python10.sh
index b28c3a449..b28c3a449 100755
--- a/tests/python10.test
+++ b/t/python10.sh
diff --git a/tests/python11.test b/t/python11.sh
index aff3c9c7c..aff3c9c7c 100755
--- a/tests/python11.test
+++ b/t/python11.sh
diff --git a/tests/python12.test b/t/python12.sh
index 3faeb457f..3faeb457f 100755
--- a/tests/python12.test
+++ b/t/python12.sh
diff --git a/tests/python2.test b/t/python2.sh
index 3b13b33f7..3b13b33f7 100755
--- a/tests/python2.test
+++ b/t/python2.sh
diff --git a/tests/python3.test b/t/python3.sh
index 72021cd86..72021cd86 100755
--- a/tests/python3.test
+++ b/t/python3.sh
diff --git a/tests/python4.test b/t/python4.sh
index 4294bb2ef..4294bb2ef 100755
--- a/tests/python4.test
+++ b/t/python4.sh
diff --git a/tests/python5.test b/t/python5.sh
index 80429f9c6..80429f9c6 100755
--- a/tests/python5.test
+++ b/t/python5.sh
diff --git a/tests/python5b.test b/t/python5b.sh
index b382b38f9..b382b38f9 100755
--- a/tests/python5b.test
+++ b/t/python5b.sh
diff --git a/tests/python6.test b/t/python6.sh
index 0e09a4381..0e09a4381 100755
--- a/tests/python6.test
+++ b/t/python6.sh
diff --git a/tests/python7.test b/t/python7.sh
index ec0ac070a..ec0ac070a 100755
--- a/tests/python7.test
+++ b/t/python7.sh
diff --git a/tests/python8.test b/t/python8.sh
index f999cb684..f999cb684 100755
--- a/tests/python8.test
+++ b/t/python8.sh
diff --git a/tests/python9.test b/t/python9.sh
index e567adcde..e567adcde 100755
--- a/tests/python9.test
+++ b/t/python9.sh
diff --git a/tests/recurs.test b/t/recurs.sh
index 5a9c16585..5a9c16585 100755
--- a/tests/recurs.test
+++ b/t/recurs.sh
diff --git a/tests/recurs2.test b/t/recurs2.sh
index e2c521337..e2c521337 100755
--- a/tests/recurs2.test
+++ b/t/recurs2.sh
diff --git a/tests/remake-all-1.test b/t/remake-all-1.sh
index f1a85bc17..f1a85bc17 100755
--- a/tests/remake-all-1.test
+++ b/t/remake-all-1.sh
diff --git a/tests/remake-all-2.test b/t/remake-all-2.sh
index 930653232..930653232 100755
--- a/tests/remake-all-2.test
+++ b/t/remake-all-2.sh
diff --git a/tests/remake-am-pr10111.test b/t/remake-am-pr10111.sh
index c56760842..c56760842 100755
--- a/tests/remake-am-pr10111.test
+++ b/t/remake-am-pr10111.sh
diff --git a/tests/remake-deleted-am-2.test b/t/remake-deleted-am-2.sh
index 1d048be04..1d048be04 100755
--- a/tests/remake-deleted-am-2.test
+++ b/t/remake-deleted-am-2.sh
diff --git a/tests/remake-deleted-am-subdir.test b/t/remake-deleted-am-subdir.sh
index 3ca850730..3ca850730 100755
--- a/tests/remake-deleted-am-subdir.test
+++ b/t/remake-deleted-am-subdir.sh
diff --git a/tests/remake-deleted-am.test b/t/remake-deleted-am.sh
index 4bd77d6fc..4bd77d6fc 100755
--- a/tests/remake-deleted-am.test
+++ b/t/remake-deleted-am.sh
diff --git a/tests/remake-deleted-m4-file.test b/t/remake-deleted-m4-file.sh
index 975d50374..975d50374 100755
--- a/tests/remake-deleted-m4-file.test
+++ b/t/remake-deleted-m4-file.sh
diff --git a/tests/remake-gnulib-add-acsubst.test b/t/remake-gnulib-add-acsubst.sh
index 23a02bc18..23a02bc18 100755
--- a/tests/remake-gnulib-add-acsubst.test
+++ b/t/remake-gnulib-add-acsubst.sh
diff --git a/tests/remake-gnulib-add-header.test b/t/remake-gnulib-add-header.sh
index 97f0c037e..97f0c037e 100755
--- a/tests/remake-gnulib-add-header.test
+++ b/t/remake-gnulib-add-header.sh
diff --git a/tests/remake-gnulib-remove-header.test b/t/remake-gnulib-remove-header.sh
index 04f341042..04f341042 100755
--- a/tests/remake-gnulib-remove-header.test
+++ b/t/remake-gnulib-remove-header.sh
diff --git a/tests/remake-m4-pr10111.test b/t/remake-m4-pr10111.sh
index 09a2a4c9f..09a2a4c9f 100755
--- a/tests/remake-m4-pr10111.test
+++ b/t/remake-m4-pr10111.sh
diff --git a/tests/remake-moved-m4-file.test b/t/remake-moved-m4-file.sh
index d5a12639f..d5a12639f 100755
--- a/tests/remake-moved-m4-file.test
+++ b/t/remake-moved-m4-file.sh
diff --git a/tests/remake-renamed-am.test b/t/remake-renamed-am.sh
index f1106f48e..f1106f48e 100755
--- a/tests/remake-renamed-am.test
+++ b/t/remake-renamed-am.sh
diff --git a/tests/remake-renamed-m4-file.test b/t/remake-renamed-m4-file.sh
index 87721f55d..87721f55d 100755
--- a/tests/remake-renamed-m4-file.test
+++ b/t/remake-renamed-m4-file.sh
diff --git a/tests/remake-renamed-m4-macro-and-file.test b/t/remake-renamed-m4-macro-and-file.sh
index 9f80b31c7..9f80b31c7 100755
--- a/tests/remake-renamed-m4-macro-and-file.test
+++ b/t/remake-renamed-m4-macro-and-file.sh
diff --git a/tests/remake-renamed-m4-macro.test b/t/remake-renamed-m4-macro.sh
index 5ec71d692..5ec71d692 100755
--- a/tests/remake-renamed-m4-macro.test
+++ b/t/remake-renamed-m4-macro.sh
diff --git a/tests/remake-subdir-from-subdir.test b/t/remake-subdir-from-subdir.sh
index a5053e07c..a5053e07c 100755
--- a/tests/remake-subdir-from-subdir.test
+++ b/t/remake-subdir-from-subdir.sh
diff --git a/tests/remake-subdir-gnu.test b/t/remake-subdir-gnu.sh
index 116790f46..116790f46 100755
--- a/tests/remake-subdir-gnu.test
+++ b/t/remake-subdir-gnu.sh
diff --git a/tests/remake-subdir-long-time.test b/t/remake-subdir-long-time.sh
index 8f3174025..8f3174025 100755
--- a/tests/remake-subdir-long-time.test
+++ b/t/remake-subdir-long-time.sh
diff --git a/tests/remake-subdir.test b/t/remake-subdir.sh
index eb21f382c..eb21f382c 100755
--- a/tests/remake-subdir.test
+++ b/t/remake-subdir.sh
diff --git a/tests/remake-subdir2.test b/t/remake-subdir2.sh
index 0a5665d97..0a5665d97 100755
--- a/tests/remake-subdir2.test
+++ b/t/remake-subdir2.sh
diff --git a/tests/remake.test b/t/remake.sh
index 620d5f8de..620d5f8de 100755
--- a/tests/remake.test
+++ b/t/remake.sh
diff --git a/tests/remake10a.test b/t/remake10a.sh
index 358554f3e..358554f3e 100755
--- a/tests/remake10a.test
+++ b/t/remake10a.sh
diff --git a/tests/remake10b.test b/t/remake10b.sh
index 9eeeb9d53..9eeeb9d53 100755
--- a/tests/remake10b.test
+++ b/t/remake10b.sh
diff --git a/tests/remake10c.test b/t/remake10c.sh
index dfb43f48e..dfb43f48e 100755
--- a/tests/remake10c.test
+++ b/t/remake10c.sh
diff --git a/tests/remake11.test b/t/remake11.sh
index ec96a0829..ec96a0829 100755
--- a/tests/remake11.test
+++ b/t/remake11.sh
diff --git a/tests/remake12.test b/t/remake12.sh
index 73d85d5b8..73d85d5b8 100755
--- a/tests/remake12.test
+++ b/t/remake12.sh
diff --git a/tests/remake1a.test b/t/remake1a.sh
index fede0920a..fede0920a 100755
--- a/tests/remake1a.test
+++ b/t/remake1a.sh
diff --git a/tests/remake2.test b/t/remake2.sh
index 228b14f56..228b14f56 100755
--- a/tests/remake2.test
+++ b/t/remake2.sh
diff --git a/tests/remake3.test b/t/remake3.sh
index 96294fb29..96294fb29 100755
--- a/tests/remake3.test
+++ b/t/remake3.sh
diff --git a/tests/remake3a.test b/t/remake3a.sh
index cac2abcc6..cac2abcc6 100755
--- a/tests/remake3a.test
+++ b/t/remake3a.sh
diff --git a/tests/remake4.test b/t/remake4.sh
index 43f856994..43f856994 100755
--- a/tests/remake4.test
+++ b/t/remake4.sh
diff --git a/tests/remake5.test b/t/remake5.sh
index dba802a89..dba802a89 100755
--- a/tests/remake5.test
+++ b/t/remake5.sh
diff --git a/tests/remake6.test b/t/remake6.sh
index c48c1b882..c48c1b882 100755
--- a/tests/remake6.test
+++ b/t/remake6.sh
diff --git a/tests/remake7.test b/t/remake7.sh
index fbd15e66b..fbd15e66b 100755
--- a/tests/remake7.test
+++ b/t/remake7.sh
diff --git a/tests/remake8a.test b/t/remake8a.sh
index 1b32a5e93..1b32a5e93 100755
--- a/tests/remake8a.test
+++ b/t/remake8a.sh
diff --git a/tests/remake8b.test b/t/remake8b.sh
index 5f687bada..5f687bada 100755
--- a/tests/remake8b.test
+++ b/t/remake8b.sh
diff --git a/tests/remake9a.test b/t/remake9a.sh
index 7ee307578..7ee307578 100755
--- a/tests/remake9a.test
+++ b/t/remake9a.sh
diff --git a/tests/remake9b.test b/t/remake9b.sh
index cab606e4d..cab606e4d 100755
--- a/tests/remake9b.test
+++ b/t/remake9b.sh
diff --git a/tests/remake9c.test b/t/remake9c.sh
index efbec30f0..efbec30f0 100755
--- a/tests/remake9c.test
+++ b/t/remake9c.sh
diff --git a/tests/remake9d.test b/t/remake9d.sh
index dddb08343..dddb08343 100755
--- a/tests/remake9d.test
+++ b/t/remake9d.sh
diff --git a/tests/repeated-options.test b/t/repeated-options.sh
index 8ad576500..8ad576500 100755
--- a/tests/repeated-options.test
+++ b/t/repeated-options.sh
diff --git a/tests/req.test b/t/req.sh
index cfc3b4399..cfc3b4399 100755
--- a/tests/req.test
+++ b/t/req.sh
diff --git a/tests/reqd.test b/t/reqd.sh
index 9e0bcc1f1..9e0bcc1f1 100755
--- a/tests/reqd.test
+++ b/t/reqd.sh
diff --git a/tests/reqd2.test b/t/reqd2.sh
index a9442a29b..a9442a29b 100755
--- a/tests/reqd2.test
+++ b/t/reqd2.sh
diff --git a/tests/rst-formatting.test b/t/rst-formatting.sh
index f23c28c2b..f23c28c2b 100755
--- a/tests/rst-formatting.test
+++ b/t/rst-formatting.sh
diff --git a/tests/rulepat.test b/t/rulepat.sh
index 5e547a509..5e547a509 100755
--- a/tests/rulepat.test
+++ b/t/rulepat.sh
diff --git a/tests/sanity.test b/t/sanity.sh
index d4f328c61..d4f328c61 100755
--- a/tests/sanity.test
+++ b/t/sanity.sh
diff --git a/tests/scripts.test b/t/scripts.sh
index 48083586c..48083586c 100755
--- a/tests/scripts.test
+++ b/t/scripts.sh
diff --git a/tests/seenc.test b/t/seenc.sh
index d1bfa23a1..d1bfa23a1 100755
--- a/tests/seenc.test
+++ b/t/seenc.sh
diff --git a/tests/self-check-cleanup.tap b/t/self-check-cleanup.tap
index bd596575c..f38b9055a 100755
--- a/tests/self-check-cleanup.tap
+++ b/t/self-check-cleanup.tap
@@ -68,7 +68,7 @@ chmod 000 $dir/sub/* $dir/file
 test $have_symlinks = yes && chmod 000 $dir/symlink
 chmod 500 $dir/sub $dir
 command_ok_ "pre-cleanup can deal with low-perms testdir" \
-            $SHELL -c  '. ./defs' dummy.test
+            $SHELL -c  '. ./defs' dummy.sh
 command_ok_ "pre-cleanup removed low-perms testdir" \
             eval 'test ! -f $dir && test ! -d $dir && test ! -r $dir'
 
@@ -93,7 +93,7 @@ command_ok_ "post-cleanup can deal with low-perms testdir" \
   test $have_symlinks = yes && chmod 000 dir/symlink
   chmod 500 dir/sub dir
   :
-' dummy.test
+' dummy.sh
 command_ok_ "post-cleanup removed null-perms testdir" \
             eval 'test ! -f $dir && test ! -d $dir && test ! -r $dir'
 
@@ -114,7 +114,7 @@ if test $have_symlinks = yes; then
   cd ..
 
   command_ok_ "pre-cleanup with testdir with zero-perms symlinks" \
-               $SHELL -c '. ./defs' dummy.test
+               $SHELL -c '. ./defs' dummy.sh
   ls -l # For debugging.
   command_ok_ "pre-cleanup chmod doesn't follow symlinks to files" \
                eval 'ls -l file | grep "^----------.*file"'
@@ -127,7 +127,7 @@ if test $have_symlinks = yes; then
     stderr_fileno_=2
     . ./defs || Exit 1
     ln -s "$ocwd/dir" "$ocwd/file" .
-  ' dummy.test
+  ' dummy.sh
   ls -l # For debugging.
   command_ok_ "post-cleanup chmod doesn't follow symlinks to files" \
                eval 'ls -l file | grep "^----------.*file"'
@@ -154,7 +154,7 @@ for st in 1 2 3 10 77 99 126 127 130 255; do
     . ./defs
     : > foo
     Exit $st
-  " dummy.test
+  " dummy.sh
   command_ok_ "testdir not removed if exiting with status $st" \
               test -f dummy.dir/foo
   do_clean
@@ -170,7 +170,7 @@ for sig in 1 2 3 9 13 15; do
     . ./defs
     : > foo
     kill -$sig \$\$
-  " dummy.test
+  " dummy.sh
   command_ok_ "testdir not removed if getting signal $sig" \
               test -f dummy.dir/foo
   do_clean
diff --git a/tests/self-check-configure-help.test b/t/self-check-configure-help.sh
index 23b9dc7cb..23b9dc7cb 100755
--- a/tests/self-check-configure-help.test
+++ b/t/self-check-configure-help.sh
diff --git a/tests/self-check-dir.tap b/t/self-check-dir.tap
index d76646238..b056ed3ec 100755
--- a/tests/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -41,7 +41,7 @@ do_check ()
     # Don't fail if 'ls -l' fails; avoids possible racy spurious failures.
     pwd; ls -l || : # For debugging.
     $3
-  " _self.test
+  " _self.sh
 }
 
 do_check 'testdir has the expected path' \
diff --git a/tests/self-check-env-sanitize.tap b/t/self-check-env-sanitize.tap
index d4e6cdb69..d4e6cdb69 100755
--- a/tests/self-check-env-sanitize.tap
+++ b/t/self-check-env-sanitize.tap
diff --git a/tests/self-check-exit.tap b/t/self-check-exit.tap
index cb655a51f..cb655a51f 100755
--- a/tests/self-check-exit.tap
+++ b/t/self-check-exit.tap
diff --git a/tests/self-check-explicit-skips.test b/t/self-check-explicit-skips.sh
index 602c31c3b..602c31c3b 100755
--- a/tests/self-check-explicit-skips.test
+++ b/t/self-check-explicit-skips.sh
diff --git a/tests/self-check-is-blocked-signal.tap b/t/self-check-is-blocked-signal.tap
index 5c0dded07..5c0dded07 100755
--- a/tests/self-check-is-blocked-signal.tap
+++ b/t/self-check-is-blocked-signal.tap
diff --git a/tests/self-check-is_newest.tap b/t/self-check-is_newest.tap
index 76b69acb4..76b69acb4 100755
--- a/tests/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
diff --git a/tests/self-check-me.tap b/t/self-check-me.tap
index 9ed430423..5c83ee6d3 100755
--- a/tests/self-check-me.tap
+++ b/t/self-check-me.tap
@@ -21,7 +21,7 @@
 am_create_testdir=no
 . ./defs || Exit 1
 
-plan_ 9
+plan_ 14
 
 AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
 
@@ -36,27 +36,31 @@ do_check ()
   command_ok_ "me=$1" test $? -eq 0
 }
 
-do_check foo-bar-.test 'foo-bar-'
-do_check _foo__bar.test '_foo__bar'
-do_check 012.test '012'
+for e in sh tap; do
+  do_check foo-bar-.$e 'foo-bar-'
+  do_check _foo__bar.$e '_foo__bar'
+  do_check 012.$e '012'
+  do_check a.b.c.$e 'a\.b\.c'
+done
+
 do_check foo.bar 'foo\.bar'
-do_check a.b.c.test 'a\.b\.c'
+do_check abc. 'abc\.'
 
 # If we override $me, ./defs should not modify it.
 
-s=`$SHELL -c 'me=foo.test && . ./defs && echo me=$me' bad.test`
+s=`$SHELL -c 'me=foo.sh && . ./defs && echo me=$me' bad.sh`
 command_ok_ "override of \$me before ./defs causes no error" \
             test $? -eq 0
 
 r='ok'
-printf '%s\n' "$s" | grep '^me=foo\.test$' || r='not ok'
-printf '%s\n' "$s" | grep 'me=bad'         && r='not ok'
+printf '%s\n' "$s" | grep '^me=foo\.sh$' || r='not ok'
+printf '%s\n' "$s" | grep 'me=bad'       && r='not ok'
 result_ "$r" "override of \$me before ./defs is honored"
 unset r
 
 # Overriding $me after sourcing ./defs-static should work.
 s=`$SHELL -c '. ./defs-static && me=zardoz &&
-              . ./defs && echo me=$me' bad.test`
+              . ./defs && echo me=$me' bad.sh`
 command_ok_ "override of \$me after ./defs-static causes no error" \
             test $? -eq 0
 
diff --git a/tests/self-check-reexec.tap b/t/self-check-reexec.tap
index 7c78e757f..48e5cfb2e 100755
--- a/tests/self-check-reexec.tap
+++ b/t/self-check-reexec.tap
@@ -86,7 +86,7 @@ get_sh ()
 # Check how to default, force or prevent a re-execution.
 #
 
-cat > need-bash.test <<'END'
+cat > need-bash.sh <<'END'
 #!/bin/false
 . ./defs
 # Ensure that the script gets re-executed with bash.  Also ensure that
@@ -104,13 +104,13 @@ sed -e "s|^testbuilddir=.*|testbuilddir='$cwd'|" \
 do_reexec ()
 {
   command_ok_ "re-exec if AM_TESTS_REEXEC=$1" \
-              env AM_TESTS_REEXEC="$1" $non_bash_shell need-bash.test
+              env AM_TESTS_REEXEC="$1" $non_bash_shell need-bash.sh
 }
 
 dont_reexec ()
 {
   command_ok_ "don't re-exec if AM_TESTS_REEXEC=$1" \
-              not env AM_TESTS_REEXEC="$1" $non_bash_shell need-bash.test
+              not env AM_TESTS_REEXEC="$1" $non_bash_shell need-bash.sh
 }
 
 if test "$bash_shell" = :; then
@@ -119,7 +119,7 @@ elif test "$non_bash_shell" = :; then
   skip_row_ 10 -r "no non-bash shell found" AM_TESTS_REEXEC
 else
   command_ok_ "re-exec if AM_TESTS_REEXEC unset" \
-              $non_bash_shell need-bash.test
+              $non_bash_shell need-bash.sh
   do_reexec ''
   do_reexec yes
   do_reexec y
@@ -136,21 +136,21 @@ fi
 # to a test script are preserved by a re-exec, even in "corner" cases.
 #
 
-cat > dummy.test <<'END'
+cat > dummy.sh <<'END'
 #!/bin/sh
 . ./defs
 :
 END
 
-cat > checkargs.test <<'END'
+cat > checkargs.sh <<'END'
 . ./defs
 test $# -eq 3 && test x"$1" = x'a' && test x"$2" = x && test x"$3" = x"-e"
 END
 
-chmod a+x dummy.test checkargs.test
+chmod a+x dummy.sh checkargs.sh
 
 mkdir sub
-cp dummy.test checkargs.test defs sub
+cp dummy.sh checkargs.sh defs sub
 sed -e "s|^testbuilddir=.*|testbuilddir='$cwd'|" \
     < ../defs-static > defs-static
 sed -e "s|^testbuilddir=.*|testbuilddir='$cwd/sub'|" \
@@ -160,7 +160,7 @@ check_preserve_args ()
 {
   dir=$1; shift
   get_ddata "$dir"
-  $sh "${dir}${dsep}checkargs.test" a '' -e && r='ok' || r='not ok'
+  $sh "${dir}${dsep}checkargs.sh" a '' -e && r='ok' || r='not ok'
   result_ "$r" "$sh re-exec preserving args [$dname]"
 }
 
@@ -168,17 +168,17 @@ check_reexec_message ()
 {
   dir=$1; shift
   get_ddata "$dir"
-  $sh "${dir}${dsep}dummy.test" "$@" \
-    | grep "^dummy: exec $SHELL ${dir}${dsep}dummy\\.test $*\$" \
+  $sh "${dir}${dsep}dummy.sh" "$@" \
+    | grep "^dummy: exec $SHELL ${dir}${dsep}dummy\\.sh $*\$" \
     && r='ok' || r='not ok'
   result_ "$r" "$sh display re-exec message [$dname] [args: $*]"
 }
 
-./dummy.test a b | grep "^dummy: exec $SHELL \\./dummy\\.test a b$" \
+./dummy.sh a b | grep "^dummy: exec $SHELL \\./dummy\\.sh a b$" \
   && r='ok' || r='not ok'
 result_ "$r" "direct run display re-exec message [args: a b]"
 
-./checkargs.test a '' -e && r='ok' || r='not ok'
+./checkargs.sh a '' -e && r='ok' || r='not ok'
 result_ "$r" "direct re-exec preserving args"
 
 for sh_type in non-bash bash; do
diff --git a/tests/self-check-report.test b/t/self-check-report.sh
index e5998b55c..e5998b55c 100755
--- a/tests/self-check-report.test
+++ b/t/self-check-report.sh
diff --git a/tests/self-check-sanity.test b/t/self-check-sanity.sh
index 8a6b85c42..8a6b85c42 100755
--- a/tests/self-check-sanity.test
+++ b/t/self-check-sanity.sh
diff --git a/tests/self-check-seq.tap b/t/self-check-seq.tap
index a92230ea5..a92230ea5 100755
--- a/tests/self-check-seq.tap
+++ b/t/self-check-seq.tap
diff --git a/tests/self-check-tap.test b/t/self-check-tap.sh
index 6a2d132fd..6a2d132fd 100755
--- a/tests/self-check-tap.test
+++ b/t/self-check-tap.sh
diff --git a/tests/self-check-unindent.tap b/t/self-check-unindent.tap
index 3591656e6..3591656e6 100755
--- a/tests/self-check-unindent.tap
+++ b/t/self-check-unindent.tap
diff --git a/tests/serial-tests.test b/t/serial-tests.sh
index 680513f5b..680513f5b 100755
--- a/tests/serial-tests.test
+++ b/t/serial-tests.sh
diff --git a/tests/silent-amopts.test b/t/silent-amopts.sh
index f71ad13bb..f71ad13bb 100755
--- a/tests/silent-amopts.test
+++ b/t/silent-amopts.sh
diff --git a/tests/silent-configsite.test b/t/silent-configsite.sh
index 813753b74..813753b74 100755
--- a/tests/silent-configsite.test
+++ b/t/silent-configsite.sh
diff --git a/tests/silent-lex.test b/t/silent-lex.sh
index 2838d6e80..2838d6e80 100755
--- a/tests/silent-lex.test
+++ b/t/silent-lex.sh
diff --git a/tests/silent-many-gcc.test b/t/silent-many-gcc.sh
index 8b457caaf..8b457caaf 100755
--- a/tests/silent-many-gcc.test
+++ b/t/silent-many-gcc.sh
diff --git a/tests/silent-many-generic.test b/t/silent-many-generic.sh
index 394900978..394900978 100755
--- a/tests/silent-many-generic.test
+++ b/t/silent-many-generic.sh
diff --git a/tests/silent-nested-vars.test b/t/silent-nested-vars.sh
index c579e2cd7..c579e2cd7 100755
--- a/tests/silent-nested-vars.test
+++ b/t/silent-nested-vars.sh
diff --git a/tests/silent-nowarn.test b/t/silent-nowarn.sh
index 5a547bc13..5a547bc13 100755
--- a/tests/silent-nowarn.test
+++ b/t/silent-nowarn.sh
diff --git a/tests/silent-yacc-headers.test b/t/silent-yacc-headers.sh
index 55ba24700..55ba24700 100755
--- a/tests/silent-yacc-headers.test
+++ b/t/silent-yacc-headers.sh
diff --git a/tests/silent-yacc.test b/t/silent-yacc.sh
index 35415bfb0..35415bfb0 100755
--- a/tests/silent-yacc.test
+++ b/t/silent-yacc.sh
diff --git a/tests/silent.test b/t/silent.sh
index f914c445c..f914c445c 100755
--- a/tests/silent.test
+++ b/t/silent.sh
diff --git a/tests/silent2.test b/t/silent2.sh
index 6565a2701..6565a2701 100755
--- a/tests/silent2.test
+++ b/t/silent2.sh
diff --git a/tests/silent3.test b/t/silent3.sh
index 564a49001..564a49001 100755
--- a/tests/silent3.test
+++ b/t/silent3.sh
diff --git a/tests/silent4.test b/t/silent4.sh
index 44b7eb3a0..44b7eb3a0 100755
--- a/tests/silent4.test
+++ b/t/silent4.sh
diff --git a/tests/silent6.test b/t/silent6.sh
index 280d25a1b..280d25a1b 100755
--- a/tests/silent6.test
+++ b/t/silent6.sh
diff --git a/tests/silent7.test b/t/silent7.sh
index 02ef287de..02ef287de 100755
--- a/tests/silent7.test
+++ b/t/silent7.sh
diff --git a/tests/silent8.test b/t/silent8.sh
index a2fdb44c1..a2fdb44c1 100755
--- a/tests/silent8.test
+++ b/t/silent8.sh
diff --git a/tests/silent9.test b/t/silent9.sh
index 70195a1a8..70195a1a8 100755
--- a/tests/silent9.test
+++ b/t/silent9.sh
diff --git a/tests/silentcxx-gcc.test b/t/silentcxx-gcc.sh
index d99f1e9cf..d99f1e9cf 100755
--- a/tests/silentcxx-gcc.test
+++ b/t/silentcxx-gcc.sh
diff --git a/tests/silentcxx.test b/t/silentcxx.sh
index a41cc2d13..a41cc2d13 100755
--- a/tests/silentcxx.test
+++ b/t/silentcxx.sh
diff --git a/tests/silentf77.test b/t/silentf77.sh
index ce6f6a044..ce6f6a044 100755
--- a/tests/silentf77.test
+++ b/t/silentf77.sh
diff --git a/tests/silentf90.test b/t/silentf90.sh
index 8bb06b262..8bb06b262 100755
--- a/tests/silentf90.test
+++ b/t/silentf90.sh
diff --git a/tests/space.test b/t/space.sh
index c46ade12f..c46ade12f 100755
--- a/tests/space.test
+++ b/t/space.sh
diff --git a/tests/specflg-dummy.test b/t/specflg-dummy.sh
index 1486f4c9c..1486f4c9c 100755
--- a/tests/specflg-dummy.test
+++ b/t/specflg-dummy.sh
diff --git a/tests/specflg.test b/t/specflg.sh
index 9d5c73ca0..9d5c73ca0 100755
--- a/tests/specflg.test
+++ b/t/specflg.sh
diff --git a/tests/specflg10.test b/t/specflg10.sh
index 3b8fc5be4..3b8fc5be4 100755
--- a/tests/specflg10.test
+++ b/t/specflg10.sh
diff --git a/tests/specflg2.test b/t/specflg2.sh
index 9f9569c8d..9f9569c8d 100755
--- a/tests/specflg2.test
+++ b/t/specflg2.sh
diff --git a/tests/specflg3.test b/t/specflg3.sh
index 9e7887264..9e7887264 100755
--- a/tests/specflg3.test
+++ b/t/specflg3.sh
diff --git a/tests/specflg6.test b/t/specflg6.sh
index f420cdfd2..f420cdfd2 100755
--- a/tests/specflg6.test
+++ b/t/specflg6.sh
diff --git a/tests/specflg7.test b/t/specflg7.sh
index 26ad75cf5..26ad75cf5 100755
--- a/tests/specflg7.test
+++ b/t/specflg7.sh
diff --git a/tests/specflg8.test b/t/specflg8.sh
index 435ce1624..435ce1624 100755
--- a/tests/specflg8.test
+++ b/t/specflg8.sh
diff --git a/tests/specflg9.test b/t/specflg9.sh
index 96e7a2e22..96e7a2e22 100755
--- a/tests/specflg9.test
+++ b/t/specflg9.sh
diff --git a/tests/spell.test b/t/spell.sh
index a2b475278..a2b475278 100755
--- a/tests/spell.test
+++ b/t/spell.sh
diff --git a/tests/spell2.test b/t/spell2.sh
index a4b0a4605..a4b0a4605 100755
--- a/tests/spell2.test
+++ b/t/spell2.sh
diff --git a/tests/spell3.test b/t/spell3.sh
index a96fa036f..a96fa036f 100755
--- a/tests/spell3.test
+++ b/t/spell3.sh
diff --git a/tests/spelling.test b/t/spelling.sh
index fb68f3103..fb68f3103 100755
--- a/tests/spelling.test
+++ b/t/spelling.sh
diff --git a/tests/spy-rm.tap b/t/spy-rm.tap
index af7ba2a5e..af7ba2a5e 100755
--- a/tests/spy-rm.tap
+++ b/t/spy-rm.tap
diff --git a/tests/spy.test b/t/spy.sh
index 0d087a41a..0d087a41a 100755
--- a/tests/spy.test
+++ b/t/spy.sh
diff --git a/tests/srcsub.test b/t/srcsub.sh
index 978a10538..978a10538 100755
--- a/tests/srcsub.test
+++ b/t/srcsub.sh
diff --git a/tests/srcsub2.test b/t/srcsub2.sh
index 2d6da9793..2d6da9793 100755
--- a/tests/srcsub2.test
+++ b/t/srcsub2.sh
diff --git a/tests/stamph2.test b/t/stamph2.sh
index 59a373a35..59a373a35 100755
--- a/tests/stamph2.test
+++ b/t/stamph2.sh
diff --git a/tests/stdinc.test b/t/stdinc.sh
index ec9948391..ec9948391 100755
--- a/tests/stdinc.test
+++ b/t/stdinc.sh
diff --git a/tests/stdlib.test b/t/stdlib.sh
index 1594707c5..1594707c5 100755
--- a/tests/stdlib.test
+++ b/t/stdlib.sh
diff --git a/tests/stdlib2.test b/t/stdlib2.sh
index ce5158f70..ce5158f70 100755
--- a/tests/stdlib2.test
+++ b/t/stdlib2.sh
diff --git a/tests/strictness-override.test b/t/strictness-override.sh
index 8c365f0a0..8c365f0a0 100755
--- a/tests/strictness-override.test
+++ b/t/strictness-override.sh
diff --git a/tests/strictness-precedence.test b/t/strictness-precedence.sh
index 6f5a143da..6f5a143da 100755
--- a/tests/strictness-precedence.test
+++ b/t/strictness-precedence.sh
diff --git a/tests/strip.test b/t/strip.sh
index dfefcd9c2..dfefcd9c2 100755
--- a/tests/strip.test
+++ b/t/strip.sh
diff --git a/tests/strip2.test b/t/strip2.sh
index 49a5c066c..49a5c066c 100755
--- a/tests/strip2.test
+++ b/t/strip2.sh
diff --git a/tests/strip3.test b/t/strip3.sh
index 187e8a58e..187e8a58e 100755
--- a/tests/strip3.test
+++ b/t/strip3.sh
diff --git a/tests/subcond.test b/t/subcond.sh
index c09e5ad4f..c09e5ad4f 100755
--- a/tests/subcond.test
+++ b/t/subcond.sh
diff --git a/tests/subcond2.test b/t/subcond2.sh
index 0e9f45137..0e9f45137 100755
--- a/tests/subcond2.test
+++ b/t/subcond2.sh
diff --git a/tests/subcond3.test b/t/subcond3.sh
index e84aa4114..e84aa4114 100755
--- a/tests/subcond3.test
+++ b/t/subcond3.sh
diff --git a/tests/subdir.test b/t/subdir.sh
index 34b6ece88..34b6ece88 100755
--- a/tests/subdir.test
+++ b/t/subdir.sh
diff --git a/tests/subdir10.test b/t/subdir10.sh
index 4ba791ad8..4ba791ad8 100755
--- a/tests/subdir10.test
+++ b/t/subdir10.sh
diff --git a/tests/subdir2.test b/t/subdir2.sh
index 31e3c61f2..31e3c61f2 100755
--- a/tests/subdir2.test
+++ b/t/subdir2.sh
diff --git a/tests/subdir3.test b/t/subdir3.sh
index d9b160fa8..d9b160fa8 100755
--- a/tests/subdir3.test
+++ b/t/subdir3.sh
diff --git a/tests/subdir4.test b/t/subdir4.sh
index 81528b2af..81528b2af 100755
--- a/tests/subdir4.test
+++ b/t/subdir4.sh
diff --git a/tests/subdir5.test b/t/subdir5.sh
index a74c746d0..a74c746d0 100755
--- a/tests/subdir5.test
+++ b/t/subdir5.sh
diff --git a/tests/subdir6.test b/t/subdir6.sh
index 5c17b6550..5c17b6550 100755
--- a/tests/subdir6.test
+++ b/t/subdir6.sh
diff --git a/tests/subdir7.test b/t/subdir7.sh
index a2c47a14f..a2c47a14f 100755
--- a/tests/subdir7.test
+++ b/t/subdir7.sh
diff --git a/tests/subdir8.test b/t/subdir8.sh
index ee9e0b0d5..ee9e0b0d5 100755
--- a/tests/subdir8.test
+++ b/t/subdir8.sh
diff --git a/tests/subdir9.test b/t/subdir9.sh
index 116e1c306..116e1c306 100755
--- a/tests/subdir9.test
+++ b/t/subdir9.sh
diff --git a/tests/subdirbuiltsources.test b/t/subdirbuiltsources.sh
index 2f507083e..2f507083e 100755
--- a/tests/subdirbuiltsources.test
+++ b/t/subdirbuiltsources.sh
diff --git a/tests/subobj.test b/t/subobj.sh
index b7f6597d4..b7f6597d4 100755
--- a/tests/subobj.test
+++ b/t/subobj.sh
diff --git a/tests/subobj10.test b/t/subobj10.sh
index db6bf7267..db6bf7267 100755
--- a/tests/subobj10.test
+++ b/t/subobj10.sh
diff --git a/tests/subobj11a.test b/t/subobj11a.sh
index 461325af2..461325af2 100755
--- a/tests/subobj11a.test
+++ b/t/subobj11a.sh
diff --git a/tests/subobj11b.test b/t/subobj11b.sh
index 129b6ea61..129b6ea61 100755
--- a/tests/subobj11b.test
+++ b/t/subobj11b.sh
diff --git a/tests/subobj11c.test b/t/subobj11c.sh
index 9f59c5f6c..9f59c5f6c 100755
--- a/tests/subobj11c.test
+++ b/t/subobj11c.sh
diff --git a/tests/subobj2.test b/t/subobj2.sh
index 3a3f86192..3a3f86192 100755
--- a/tests/subobj2.test
+++ b/t/subobj2.sh
diff --git a/tests/subobj4.test b/t/subobj4.sh
index 975f8fbb8..975f8fbb8 100755
--- a/tests/subobj4.test
+++ b/t/subobj4.sh
diff --git a/tests/subobj5.test b/t/subobj5.sh
index 3b05b6a74..3b05b6a74 100755
--- a/tests/subobj5.test
+++ b/t/subobj5.sh
diff --git a/tests/subobj6.test b/t/subobj6.sh
index 2f902f20a..2f902f20a 100755
--- a/tests/subobj6.test
+++ b/t/subobj6.sh
diff --git a/tests/subobj7.test b/t/subobj7.sh
index 863cae031..863cae031 100755
--- a/tests/subobj7.test
+++ b/t/subobj7.sh
diff --git a/tests/subobj8.test b/t/subobj8.sh
index 35b566f50..35b566f50 100755
--- a/tests/subobj8.test
+++ b/t/subobj8.sh
diff --git a/tests/subobj9.test b/t/subobj9.sh
index f706edf4d..f706edf4d 100755
--- a/tests/subobj9.test
+++ b/t/subobj9.sh
diff --git a/tests/subobjname.test b/t/subobjname.sh
index bef3bf0bd..bef3bf0bd 100755
--- a/tests/subobjname.test
+++ b/t/subobjname.sh
diff --git a/tests/subpkg-yacc.test b/t/subpkg-yacc.sh
index f1b2ac31c..f1b2ac31c 100755
--- a/tests/subpkg-yacc.test
+++ b/t/subpkg-yacc.sh
diff --git a/tests/subpkg.test b/t/subpkg.sh
index 82bf33818..82bf33818 100755
--- a/tests/subpkg.test
+++ b/t/subpkg.sh
diff --git a/tests/subpkg2.test b/t/subpkg2.sh
index af89fc173..af89fc173 100755
--- a/tests/subpkg2.test
+++ b/t/subpkg2.sh
diff --git a/tests/subpkg3.test b/t/subpkg3.sh
index 38dc455b9..38dc455b9 100755
--- a/tests/subpkg3.test
+++ b/t/subpkg3.sh
diff --git a/tests/subpkg4.test b/t/subpkg4.sh
index f8e9a2c49..f8e9a2c49 100755
--- a/tests/subpkg4.test
+++ b/t/subpkg4.sh
diff --git a/tests/subst-no-trailing-empty-line.test b/t/subst-no-trailing-empty-line.sh
index 2069e3a1c..2069e3a1c 100755
--- a/tests/subst-no-trailing-empty-line.test
+++ b/t/subst-no-trailing-empty-line.sh
diff --git a/tests/subst.test b/t/subst.sh
index f46f2ed9a..f46f2ed9a 100755
--- a/tests/subst.test
+++ b/t/subst.sh
diff --git a/tests/subst3.test b/t/subst3.sh
index cc81063e3..cc81063e3 100755
--- a/tests/subst3.test
+++ b/t/subst3.sh
diff --git a/tests/subst4.test b/t/subst4.sh
index ab3631e14..ab3631e14 100755
--- a/tests/subst4.test
+++ b/t/subst4.sh
diff --git a/tests/subst5.test b/t/subst5.sh
index 2fef1b9d5..2fef1b9d5 100755
--- a/tests/subst5.test
+++ b/t/subst5.sh
diff --git a/tests/substre2.test b/t/substre2.sh
index a205c085d..a205c085d 100755
--- a/tests/substre2.test
+++ b/t/substre2.sh
diff --git a/tests/substref.test b/t/substref.sh
index 7183a9146..7183a9146 100755
--- a/tests/substref.test
+++ b/t/substref.sh
diff --git a/tests/substtarg.test b/t/substtarg.sh
index 2e695f843..2e695f843 100755
--- a/tests/substtarg.test
+++ b/t/substtarg.sh
diff --git a/tests/suffix-chain.tap b/t/suffix-chain.tap
index 604e8a9c2..604e8a9c2 100755
--- a/tests/suffix-chain.tap
+++ b/t/suffix-chain.tap
diff --git a/tests/suffix.test b/t/suffix.sh
index f9944cb6c..f9944cb6c 100755
--- a/tests/suffix.test
+++ b/t/suffix.sh
diff --git a/tests/suffix10.tap b/t/suffix10.tap
index 72d0accb8..72d0accb8 100755
--- a/tests/suffix10.tap
+++ b/t/suffix10.tap
diff --git a/tests/suffix11.tap b/t/suffix11.tap
index d365fbcc7..d365fbcc7 100755
--- a/tests/suffix11.tap
+++ b/t/suffix11.tap
diff --git a/tests/suffix12.test b/t/suffix12.sh
index 5882df7d6..5882df7d6 100755
--- a/tests/suffix12.test
+++ b/t/suffix12.sh
diff --git a/tests/suffix13.test b/t/suffix13.sh
index 60222052a..60222052a 100755
--- a/tests/suffix13.test
+++ b/t/suffix13.sh
diff --git a/tests/suffix2.test b/t/suffix2.sh
index 6dd26164d..6dd26164d 100755
--- a/tests/suffix2.test
+++ b/t/suffix2.sh
diff --git a/tests/suffix3.tap b/t/suffix3.tap
index 168c84264..168c84264 100755
--- a/tests/suffix3.tap
+++ b/t/suffix3.tap
diff --git a/tests/suffix4.test b/t/suffix4.sh
index 4523096a2..4523096a2 100755
--- a/tests/suffix4.test
+++ b/t/suffix4.sh
diff --git a/tests/suffix5.test b/t/suffix5.sh
index 8608a86b5..8608a86b5 100755
--- a/tests/suffix5.test
+++ b/t/suffix5.sh
diff --git a/tests/suffix6.test b/t/suffix6.sh
index 29ffc4d40..29ffc4d40 100755
--- a/tests/suffix6.test
+++ b/t/suffix6.sh
diff --git a/tests/suffix6b.test b/t/suffix6b.sh
index 319e02179..319e02179 100755
--- a/tests/suffix6b.test
+++ b/t/suffix6b.sh
diff --git a/tests/suffix6c.test b/t/suffix6c.sh
index 80f3bf019..80f3bf019 100755
--- a/tests/suffix6c.test
+++ b/t/suffix6c.sh
diff --git a/tests/suffix7.test b/t/suffix7.sh
index bef1031d2..bef1031d2 100755
--- a/tests/suffix7.test
+++ b/t/suffix7.sh
diff --git a/tests/suffix8.tap b/t/suffix8.tap
index 288dd99df..288dd99df 100755
--- a/tests/suffix8.tap
+++ b/t/suffix8.tap
diff --git a/tests/suffix9.test b/t/suffix9.sh
index 2c1d73dde..2c1d73dde 100755
--- a/tests/suffix9.test
+++ b/t/suffix9.sh
diff --git a/tests/symlink.test b/t/symlink.sh
index f4b4338d8..f4b4338d8 100755
--- a/tests/symlink.test
+++ b/t/symlink.sh
diff --git a/tests/symlink2.test b/t/symlink2.sh
index 46e26db9c..46e26db9c 100755
--- a/tests/symlink2.test
+++ b/t/symlink2.sh
diff --git a/tests/syntax.test b/t/syntax.sh
index 5b51a7a60..5b51a7a60 100755
--- a/tests/syntax.test
+++ b/t/syntax.sh
diff --git a/tests/tags.test b/t/tags.sh
index b1b95a2ae..b1b95a2ae 100755
--- a/tests/tags.test
+++ b/t/tags.sh
diff --git a/tests/tags2.test b/t/tags2.sh
index 7d4ee6440..7d4ee6440 100755
--- a/tests/tags2.test
+++ b/t/tags2.sh
diff --git a/tests/tagsub.test b/t/tagsub.sh
index 5915d46c0..5915d46c0 100755
--- a/tests/tagsub.test
+++ b/t/tagsub.sh
diff --git a/tests/tap-ambiguous-directive.test b/t/tap-ambiguous-directive.sh
index 32b1b803e..32b1b803e 100755
--- a/tests/tap-ambiguous-directive.test
+++ b/t/tap-ambiguous-directive.sh
diff --git a/tests/tap-autonumber.test b/t/tap-autonumber.sh
index 4e88f3de0..4e88f3de0 100755
--- a/tests/tap-autonumber.test
+++ b/t/tap-autonumber.sh
diff --git a/tests/tap-bad-prog.tap b/t/tap-bad-prog.tap
index 580e7d31c..580e7d31c 100755
--- a/tests/tap-bad-prog.tap
+++ b/t/tap-bad-prog.tap
diff --git a/tests/tap-bailout-and-logging.test b/t/tap-bailout-and-logging.sh
index cc95d9881..cc95d9881 100755
--- a/tests/tap-bailout-and-logging.test
+++ b/t/tap-bailout-and-logging.sh
diff --git a/tests/tap-bailout-leading-space.test b/t/tap-bailout-leading-space.sh
index 94084d460..94084d460 100755
--- a/tests/tap-bailout-leading-space.test
+++ b/t/tap-bailout-leading-space.sh
diff --git a/tests/tap-bailout-suppress-badexit.test b/t/tap-bailout-suppress-badexit.sh
index 196263992..196263992 100755
--- a/tests/tap-bailout-suppress-badexit.test
+++ b/t/tap-bailout-suppress-badexit.sh
diff --git a/tests/tap-bailout-suppress-later-diagnostic.test b/t/tap-bailout-suppress-later-diagnostic.sh
index 9bc29dec5..9bc29dec5 100755
--- a/tests/tap-bailout-suppress-later-diagnostic.test
+++ b/t/tap-bailout-suppress-later-diagnostic.sh
diff --git a/tests/tap-bailout-suppress-later-errors.test b/t/tap-bailout-suppress-later-errors.sh
index e6cc6c237..e6cc6c237 100755
--- a/tests/tap-bailout-suppress-later-errors.test
+++ b/t/tap-bailout-suppress-later-errors.sh
diff --git a/tests/tap-bailout.test b/t/tap-bailout.sh
index 0def87ef5..0def87ef5 100755
--- a/tests/tap-bailout.test
+++ b/t/tap-bailout.sh
diff --git a/tests/tap-basic.test b/t/tap-basic.sh
index 3d6d8fe23..3d6d8fe23 100755
--- a/tests/tap-basic.test
+++ b/t/tap-basic.sh
diff --git a/tests/tap-color.test b/t/tap-color.sh
index b8c4004f9..b8c4004f9 100755
--- a/tests/tap-color.test
+++ b/t/tap-color.sh
diff --git a/tests/tap-common-setup.test b/t/tap-common-setup.sh
index b14099a5f..b14099a5f 100755
--- a/tests/tap-common-setup.test
+++ b/t/tap-common-setup.sh
diff --git a/tests/tap-deps.test b/t/tap-deps.sh
index 5049171d5..5049171d5 100755
--- a/tests/tap-deps.test
+++ b/t/tap-deps.sh
diff --git a/tests/tap-diagnostic-custom.test b/t/tap-diagnostic-custom.sh
index d3f28a577..d3f28a577 100755
--- a/tests/tap-diagnostic-custom.test
+++ b/t/tap-diagnostic-custom.sh
diff --git a/tests/tap-diagnostic.test b/t/tap-diagnostic.sh
index 31f5df6e2..31f5df6e2 100755
--- a/tests/tap-diagnostic.test
+++ b/t/tap-diagnostic.sh
diff --git a/tests/tap-doc.test b/t/tap-doc.sh
index 46b3b510c..46b3b510c 100755
--- a/tests/tap-doc.test
+++ b/t/tap-doc.sh
diff --git a/tests/tap-doc2.test b/t/tap-doc2.sh
index 76e1ade5f..76e1ade5f 100755
--- a/tests/tap-doc2.test
+++ b/t/tap-doc2.sh
diff --git a/tests/tap-driver-stderr.test b/t/tap-driver-stderr.sh
index 879d051b7..879d051b7 100755
--- a/tests/tap-driver-stderr.test
+++ b/t/tap-driver-stderr.sh
diff --git a/tests/tap-empty-diagnostic.test b/t/tap-empty-diagnostic.sh
index 1a8a99ba2..1a8a99ba2 100755
--- a/tests/tap-empty-diagnostic.test
+++ b/t/tap-empty-diagnostic.sh
diff --git a/tests/tap-empty.test b/t/tap-empty.sh
index 4d3bfda9c..4d3bfda9c 100755
--- a/tests/tap-empty.test
+++ b/t/tap-empty.sh
diff --git a/tests/tap-escape-directive-2.test b/t/tap-escape-directive-2.sh
index 595c38458..595c38458 100755
--- a/tests/tap-escape-directive-2.test
+++ b/t/tap-escape-directive-2.sh
diff --git a/tests/tap-escape-directive.test b/t/tap-escape-directive.sh
index 8b242510b..8b242510b 100755
--- a/tests/tap-escape-directive.test
+++ b/t/tap-escape-directive.sh
diff --git a/tests/tap-exit.test b/t/tap-exit.sh
index abc1ace0d..abc1ace0d 100755
--- a/tests/tap-exit.test
+++ b/t/tap-exit.sh
diff --git a/tests/tap-fancy.test b/t/tap-fancy.sh
index 6815ac54b..6815ac54b 100755
--- a/tests/tap-fancy.test
+++ b/t/tap-fancy.sh
diff --git a/tests/tap-fancy2.test b/t/tap-fancy2.sh
index bb51d54e5..bb51d54e5 100755
--- a/tests/tap-fancy2.test
+++ b/t/tap-fancy2.sh
diff --git a/tests/tap-global-log.test b/t/tap-global-log.sh
index 69dc5b016..69dc5b016 100755
--- a/tests/tap-global-log.test
+++ b/t/tap-global-log.sh
diff --git a/tests/tap-global-result.test b/t/tap-global-result.sh
index 78d5c9fea..78d5c9fea 100755
--- a/tests/tap-global-result.test
+++ b/t/tap-global-result.sh
diff --git a/tests/tap-log.test b/t/tap-log.sh
index ca564e1e5..ca564e1e5 100755
--- a/tests/tap-log.test
+++ b/t/tap-log.sh
diff --git a/tests/tap-merge-stdout-stderr.test b/t/tap-merge-stdout-stderr.sh
index 351b10d58..351b10d58 100755
--- a/tests/tap-merge-stdout-stderr.test
+++ b/t/tap-merge-stdout-stderr.sh
diff --git a/tests/tap-missing-plan-and-bad-exit.test b/t/tap-missing-plan-and-bad-exit.sh
index e1ea4fd40..e1ea4fd40 100755
--- a/tests/tap-missing-plan-and-bad-exit.test
+++ b/t/tap-missing-plan-and-bad-exit.sh
diff --git a/tests/tap-more.test b/t/tap-more.sh
index 6f5d5fe4b..6f5d5fe4b 100755
--- a/tests/tap-more.test
+++ b/t/tap-more.sh
diff --git a/tests/tap-more2.test b/t/tap-more2.sh
index 3cefd5800..3cefd5800 100755
--- a/tests/tap-more2.test
+++ b/t/tap-more2.sh
diff --git a/tests/tap-msg0-bailout.test b/t/tap-msg0-bailout.sh
index 115ffcdb9..115ffcdb9 100755
--- a/tests/tap-msg0-bailout.test
+++ b/t/tap-msg0-bailout.sh
diff --git a/tests/tap-msg0-directive.test b/t/tap-msg0-directive.sh
index 04d379071..04d379071 100755
--- a/tests/tap-msg0-directive.test
+++ b/t/tap-msg0-directive.sh
diff --git a/tests/tap-msg0-misc.test b/t/tap-msg0-misc.sh
index 6a515a8a8..6a515a8a8 100755
--- a/tests/tap-msg0-misc.test
+++ b/t/tap-msg0-misc.sh
diff --git a/tests/tap-msg0-planskip.test b/t/tap-msg0-planskip.sh
index 60aa5fe12..60aa5fe12 100755
--- a/tests/tap-msg0-planskip.test
+++ b/t/tap-msg0-planskip.sh
diff --git a/tests/tap-msg0-result.test b/t/tap-msg0-result.sh
index 8c464c418..8c464c418 100755
--- a/tests/tap-msg0-result.test
+++ b/t/tap-msg0-result.sh
diff --git a/tests/tap-negative-numbers.test b/t/tap-negative-numbers.sh
index 67ecb1e5e..67ecb1e5e 100755
--- a/tests/tap-negative-numbers.test
+++ b/t/tap-negative-numbers.sh
diff --git a/tests/tap-no-disable-hard-error.test b/t/tap-no-disable-hard-error.sh
index c95e20e97..c95e20e97 100755
--- a/tests/tap-no-disable-hard-error.test
+++ b/t/tap-no-disable-hard-error.sh
diff --git a/tests/tap-no-merge-stdout-stderr.test b/t/tap-no-merge-stdout-stderr.sh
index 0236ef8ac..0236ef8ac 100755
--- a/tests/tap-no-merge-stdout-stderr.test
+++ b/t/tap-no-merge-stdout-stderr.sh
diff --git a/tests/tap-no-spurious-numbers.test b/t/tap-no-spurious-numbers.sh
index 2fc993e01..2fc993e01 100755
--- a/tests/tap-no-spurious-numbers.test
+++ b/t/tap-no-spurious-numbers.sh
diff --git a/tests/tap-no-spurious-summary.test b/t/tap-no-spurious-summary.sh
index 8da15e8c3..8da15e8c3 100755
--- a/tests/tap-no-spurious-summary.test
+++ b/t/tap-no-spurious-summary.sh
diff --git a/tests/tap-no-spurious.test b/t/tap-no-spurious.sh
index ac6e6687d..ac6e6687d 100755
--- a/tests/tap-no-spurious.test
+++ b/t/tap-no-spurious.sh
diff --git a/tests/tap-not-ok-skip.test b/t/tap-not-ok-skip.sh
index 8cfffe2e4..8cfffe2e4 100755
--- a/tests/tap-not-ok-skip.test
+++ b/t/tap-not-ok-skip.sh
diff --git a/tests/tap-number-wordboundary.test b/t/tap-number-wordboundary.sh
index 7aa2c7f09..7aa2c7f09 100755
--- a/tests/tap-number-wordboundary.test
+++ b/t/tap-number-wordboundary.sh
diff --git a/tests/tap-numbers-leading-zero.test b/t/tap-numbers-leading-zero.sh
index 345b31f0f..345b31f0f 100755
--- a/tests/tap-numbers-leading-zero.test
+++ b/t/tap-numbers-leading-zero.sh
diff --git a/tests/tap-numeric-description.test b/t/tap-numeric-description.sh
index b2f54f3b7..b2f54f3b7 100755
--- a/tests/tap-numeric-description.test
+++ b/t/tap-numeric-description.sh
diff --git a/tests/tap-out-of-order.test b/t/tap-out-of-order.sh
index d9f36a251..d9f36a251 100755
--- a/tests/tap-out-of-order.test
+++ b/t/tap-out-of-order.sh
diff --git a/tests/tap-passthrough-exit.test b/t/tap-passthrough-exit.sh
index 75ce5f105..75ce5f105 100755
--- a/tests/tap-passthrough-exit.test
+++ b/t/tap-passthrough-exit.sh
diff --git a/tests/tap-passthrough.test b/t/tap-passthrough.sh
index da05b1b1a..da05b1b1a 100755
--- a/tests/tap-passthrough.test
+++ b/t/tap-passthrough.sh
diff --git a/tests/tap-plan-corner.test b/t/tap-plan-corner.sh
index 3b9cd1fe9..3b9cd1fe9 100755
--- a/tests/tap-plan-corner.test
+++ b/t/tap-plan-corner.sh
diff --git a/tests/tap-plan-errors.test b/t/tap-plan-errors.sh
index 1b740599e..1b740599e 100755
--- a/tests/tap-plan-errors.test
+++ b/t/tap-plan-errors.sh
diff --git a/tests/tap-plan-leading-zero.test b/t/tap-plan-leading-zero.sh
index bb45f31f6..bb45f31f6 100755
--- a/tests/tap-plan-leading-zero.test
+++ b/t/tap-plan-leading-zero.sh
diff --git a/tests/tap-plan-malformed.test b/t/tap-plan-malformed.sh
index c8d2cdc30..c8d2cdc30 100755
--- a/tests/tap-plan-malformed.test
+++ b/t/tap-plan-malformed.sh
diff --git a/tests/tap-plan-middle.test b/t/tap-plan-middle.sh
index 0775f1029..0775f1029 100755
--- a/tests/tap-plan-middle.test
+++ b/t/tap-plan-middle.sh
diff --git a/tests/tap-plan-whitespace.test b/t/tap-plan-whitespace.sh
index 7bdb4dc1d..7bdb4dc1d 100755
--- a/tests/tap-plan-whitespace.test
+++ b/t/tap-plan-whitespace.sh
diff --git a/tests/tap-plan.test b/t/tap-plan.sh
index d85a3a21f..d85a3a21f 100755
--- a/tests/tap-plan.test
+++ b/t/tap-plan.sh
diff --git a/tests/tap-planskip-and-logging.test b/t/tap-planskip-and-logging.sh
index 48b3e1238..48b3e1238 100755
--- a/tests/tap-planskip-and-logging.test
+++ b/t/tap-planskip-and-logging.sh
diff --git a/tests/tap-planskip-badexit.test b/t/tap-planskip-badexit.sh
index fbb3b56e6..fbb3b56e6 100755
--- a/tests/tap-planskip-badexit.test
+++ b/t/tap-planskip-badexit.sh
diff --git a/tests/tap-planskip-bailout.test b/t/tap-planskip-bailout.sh
index 7fb72e9d4..7fb72e9d4 100755
--- a/tests/tap-planskip-bailout.test
+++ b/t/tap-planskip-bailout.sh
diff --git a/tests/tap-planskip-case-insensitive.test b/t/tap-planskip-case-insensitive.sh
index b26701c53..b26701c53 100755
--- a/tests/tap-planskip-case-insensitive.test
+++ b/t/tap-planskip-case-insensitive.sh
diff --git a/tests/tap-planskip-late.test b/t/tap-planskip-late.sh
index f89a55dcc..f89a55dcc 100755
--- a/tests/tap-planskip-late.test
+++ b/t/tap-planskip-late.sh
diff --git a/tests/tap-planskip-later-errors.test b/t/tap-planskip-later-errors.sh
index a73dbce36..a73dbce36 100755
--- a/tests/tap-planskip-later-errors.test
+++ b/t/tap-planskip-later-errors.sh
diff --git a/tests/tap-planskip-unplanned-corner.test b/t/tap-planskip-unplanned-corner.sh
index 6dff7ac27..6dff7ac27 100755
--- a/tests/tap-planskip-unplanned-corner.test
+++ b/t/tap-planskip-unplanned-corner.sh
diff --git a/tests/tap-planskip-unplanned.test b/t/tap-planskip-unplanned.sh
index 4aeb4de81..4aeb4de81 100755
--- a/tests/tap-planskip-unplanned.test
+++ b/t/tap-planskip-unplanned.sh
diff --git a/tests/tap-planskip-whitespace.test b/t/tap-planskip-whitespace.sh
index a4dae998b..a4dae998b 100755
--- a/tests/tap-planskip-whitespace.test
+++ b/t/tap-planskip-whitespace.sh
diff --git a/tests/tap-planskip.test b/t/tap-planskip.sh
index 97ebd0c66..97ebd0c66 100755
--- a/tests/tap-planskip.test
+++ b/t/tap-planskip.sh
diff --git a/tests/tap-realtime.test b/t/tap-realtime.sh
index 51f7bba93..51f7bba93 100755
--- a/tests/tap-realtime.test
+++ b/t/tap-realtime.sh
diff --git a/tests/tap-recheck-logs.test b/t/tap-recheck-logs.sh
index 53b2370cb..53b2370cb 100755
--- a/tests/tap-recheck-logs.test
+++ b/t/tap-recheck-logs.sh
diff --git a/tests/tap-recheck.test b/t/tap-recheck.sh
index 4b120a529..4b120a529 100755
--- a/tests/tap-recheck.test
+++ b/t/tap-recheck.sh
diff --git a/tests/tap-result-comment.test b/t/tap-result-comment.sh
index 7162df02a..7162df02a 100755
--- a/tests/tap-result-comment.test
+++ b/t/tap-result-comment.sh
diff --git a/tests/tap-signal.tap b/t/tap-signal.tap
index ab1cd40ef..ab1cd40ef 100755
--- a/tests/tap-signal.tap
+++ b/t/tap-signal.tap
diff --git a/tests/tap-summary-color.test b/t/tap-summary-color.sh
index a28512b69..a28512b69 100755
--- a/tests/tap-summary-color.test
+++ b/t/tap-summary-color.sh
diff --git a/tests/tap-summary.test b/t/tap-summary.sh
index deee09984..deee09984 100755
--- a/tests/tap-summary.test
+++ b/t/tap-summary.sh
diff --git a/tests/tap-test-number-0.test b/t/tap-test-number-0.sh
index cf75cef4f..cf75cef4f 100755
--- a/tests/tap-test-number-0.test
+++ b/t/tap-test-number-0.sh
diff --git a/tests/tap-todo-skip-together.test b/t/tap-todo-skip-together.sh
index e91153238..e91153238 100755
--- a/tests/tap-todo-skip-together.test
+++ b/t/tap-todo-skip-together.sh
diff --git a/tests/tap-todo-skip-whitespace.test b/t/tap-todo-skip-whitespace.sh
index 9d7afb962..9d7afb962 100755
--- a/tests/tap-todo-skip-whitespace.test
+++ b/t/tap-todo-skip-whitespace.sh
diff --git a/tests/tap-todo-skip.test b/t/tap-todo-skip.sh
index e261d5790..e261d5790 100755
--- a/tests/tap-todo-skip.test
+++ b/t/tap-todo-skip.sh
diff --git a/tests/tap-unplanned.test b/t/tap-unplanned.sh
index 252e946c9..252e946c9 100755
--- a/tests/tap-unplanned.test
+++ b/t/tap-unplanned.sh
diff --git a/tests/tap-whitespace-normalization.test b/t/tap-whitespace-normalization.sh
index 227467441..227467441 100755
--- a/tests/tap-whitespace-normalization.test
+++ b/t/tap-whitespace-normalization.sh
diff --git a/tests/tap-with-and-without-number.test b/t/tap-with-and-without-number.sh
index fc795f6f9..fc795f6f9 100755
--- a/tests/tap-with-and-without-number.test
+++ b/t/tap-with-and-without-number.sh
diff --git a/tests/tap-xfail-tests.test b/t/tap-xfail-tests.sh
index 610779201..610779201 100755
--- a/tests/tap-xfail-tests.test
+++ b/t/tap-xfail-tests.sh
diff --git a/tests/tar-override.test b/t/tar-override.sh
index 641ce861d..641ce861d 100755
--- a/tests/tar-override.test
+++ b/t/tar-override.sh
diff --git a/tests/tar.test b/t/tar.sh
index 263049ad0..263049ad0 100755
--- a/tests/tar.test
+++ b/t/tar.sh
diff --git a/tests/tar2.test b/t/tar2.sh
index f9cc00052..f9cc00052 100755
--- a/tests/tar2.test
+++ b/t/tar2.sh
diff --git a/tests/tar3.test b/t/tar3.sh
index 403ce9916..403ce9916 100755
--- a/tests/tar3.test
+++ b/t/tar3.sh
diff --git a/tests/target-cflags.test b/t/target-cflags.sh
index ad0e94d4f..ad0e94d4f 100755
--- a/tests/target-cflags.test
+++ b/t/target-cflags.sh
diff --git a/tests/targetclash.test b/t/targetclash.sh
index 43e227da1..43e227da1 100755
--- a/tests/targetclash.test
+++ b/t/targetclash.sh
diff --git a/tests/test-driver-acsubst.test b/t/test-driver-acsubst.sh
index 7df66ae77..7df66ae77 100755
--- a/tests/test-driver-acsubst.test
+++ b/t/test-driver-acsubst.sh
diff --git a/tests/test-driver-cond.test b/t/test-driver-cond.sh
index ac0b3f171..ac0b3f171 100755
--- a/tests/test-driver-cond.test
+++ b/t/test-driver-cond.sh
diff --git a/tests/test-driver-create-log-dir.test b/t/test-driver-create-log-dir.sh
index bfca0b938..bfca0b938 100755
--- a/tests/test-driver-create-log-dir.test
+++ b/t/test-driver-create-log-dir.sh
diff --git a/tests/test-driver-custom-multitest-recheck.test b/t/test-driver-custom-multitest-recheck.sh
index 9b4f5dfa3..9b4f5dfa3 100755
--- a/tests/test-driver-custom-multitest-recheck.test
+++ b/t/test-driver-custom-multitest-recheck.sh
diff --git a/tests/test-driver-custom-multitest-recheck2.test b/t/test-driver-custom-multitest-recheck2.sh
index 3e7add6d4..3e7add6d4 100755
--- a/tests/test-driver-custom-multitest-recheck2.test
+++ b/t/test-driver-custom-multitest-recheck2.sh
diff --git a/tests/test-driver-custom-multitest.test b/t/test-driver-custom-multitest.sh
index c7959cd42..c7959cd42 100755
--- a/tests/test-driver-custom-multitest.test
+++ b/t/test-driver-custom-multitest.sh
diff --git a/tests/test-driver-custom-no-extra-driver.test b/t/test-driver-custom-no-extra-driver.sh
index 31000aff1..31000aff1 100755
--- a/tests/test-driver-custom-no-extra-driver.test
+++ b/t/test-driver-custom-no-extra-driver.sh
diff --git a/tests/test-driver-custom-xfail-tests.test b/t/test-driver-custom-xfail-tests.sh
index 9a4e3fec5..9a4e3fec5 100755
--- a/tests/test-driver-custom-xfail-tests.test
+++ b/t/test-driver-custom-xfail-tests.sh
diff --git a/tests/test-driver-custom.test b/t/test-driver-custom.sh
index 60ce07418..60ce07418 100755
--- a/tests/test-driver-custom.test
+++ b/t/test-driver-custom.sh
diff --git a/tests/test-driver-fail.test b/t/test-driver-fail.sh
index 0eb226800..0eb226800 100755
--- a/tests/test-driver-fail.test
+++ b/t/test-driver-fail.sh
diff --git a/tests/test-driver-is-distributed.test b/t/test-driver-is-distributed.sh
index fb4e540af..fb4e540af 100755
--- a/tests/test-driver-is-distributed.test
+++ b/t/test-driver-is-distributed.sh
diff --git a/tests/test-driver-strip-vpath.test b/t/test-driver-strip-vpath.sh
index 967018854..967018854 100755
--- a/tests/test-driver-strip-vpath.test
+++ b/t/test-driver-strip-vpath.sh
diff --git a/tests/test-driver-trs-suffix-registered.test b/t/test-driver-trs-suffix-registered.sh
index 0c3734f88..0c3734f88 100755
--- a/tests/test-driver-trs-suffix-registered.test
+++ b/t/test-driver-trs-suffix-registered.sh
diff --git a/tests/test-extensions-cond.test b/t/test-extensions-cond.sh
index 81808033a..81808033a 100755
--- a/tests/test-extensions-cond.test
+++ b/t/test-extensions-cond.sh
diff --git a/tests/test-extensions.test b/t/test-extensions.sh
index d2fc2dd06..d2fc2dd06 100755
--- a/tests/test-extensions.test
+++ b/t/test-extensions.sh
diff --git a/tests/test-harness-vpath-rewrite.test b/t/test-harness-vpath-rewrite.sh
index f0f71c66f..f0f71c66f 100755
--- a/tests/test-harness-vpath-rewrite.test
+++ b/t/test-harness-vpath-rewrite.sh
diff --git a/tests/test-log.test b/t/test-log.sh
index d400b52bc..d400b52bc 100755
--- a/tests/test-log.test
+++ b/t/test-log.sh
diff --git a/tests/test-logs-repeated.test b/t/test-logs-repeated.sh
index d75bbcb15..d75bbcb15 100755
--- a/tests/test-logs-repeated.test
+++ b/t/test-logs-repeated.sh
diff --git a/tests/test-metadata-global-log.test b/t/test-metadata-global-log.sh
index b10f481d2..b10f481d2 100755
--- a/tests/test-metadata-global-log.test
+++ b/t/test-metadata-global-log.sh
diff --git a/tests/test-metadata-global-result.test b/t/test-metadata-global-result.sh
index b2474449c..b2474449c 100755
--- a/tests/test-metadata-global-result.test
+++ b/t/test-metadata-global-result.sh
diff --git a/tests/test-metadata-recheck.test b/t/test-metadata-recheck.sh
index 0a7a7ccb4..0a7a7ccb4 100755
--- a/tests/test-metadata-recheck.test
+++ b/t/test-metadata-recheck.sh
diff --git a/tests/test-metadata-results.test b/t/test-metadata-results.sh
index 5978f7f25..5978f7f25 100755
--- a/tests/test-metadata-results.test
+++ b/t/test-metadata-results.sh
diff --git a/tests/test-missing.test b/t/test-missing.sh
index 586190fb2..586190fb2 100755
--- a/tests/test-missing.test
+++ b/t/test-missing.sh
diff --git a/tests/test-missing2.test b/t/test-missing2.sh
index e511a8b4e..e511a8b4e 100755
--- a/tests/test-missing2.test
+++ b/t/test-missing2.sh
diff --git a/tests/test-trs-basic.test b/t/test-trs-basic.sh
index a82d260bd..a82d260bd 100755
--- a/tests/test-trs-basic.test
+++ b/t/test-trs-basic.sh
diff --git a/tests/test-trs-recover.test b/t/test-trs-recover.sh
index 3632f61f7..3632f61f7 100755
--- a/tests/test-trs-recover.test
+++ b/t/test-trs-recover.sh
diff --git a/tests/test-trs-recover2.test b/t/test-trs-recover2.sh
index 97268703d..97268703d 100755
--- a/tests/test-trs-recover2.test
+++ b/t/test-trs-recover2.sh
diff --git a/tests/tests-environment-and-log-compiler.test b/t/tests-environment-and-log-compiler.sh
index 0e9d6e737..0e9d6e737 100755
--- a/tests/tests-environment-and-log-compiler.test
+++ b/t/tests-environment-and-log-compiler.sh
diff --git a/tests/tests-environment-backcompat.test b/t/tests-environment-backcompat.sh
index 61b2728cf..61b2728cf 100755
--- a/tests/tests-environment-backcompat.test
+++ b/t/tests-environment-backcompat.sh
diff --git a/tests/tests-environment-fd-redirect.test b/t/tests-environment-fd-redirect.sh
index d62e537d6..d62e537d6 100755
--- a/tests/tests-environment-fd-redirect.test
+++ b/t/tests-environment-fd-redirect.sh
diff --git a/tests/tests-environment.test b/t/tests-environment.sh
index 27cd458f2..27cd458f2 100755
--- a/tests/tests-environment.test
+++ b/t/tests-environment.sh
diff --git a/tests/testsuite-summary-color.test b/t/testsuite-summary-color.sh
index 0f0070808..0f0070808 100755
--- a/tests/testsuite-summary-color.test
+++ b/t/testsuite-summary-color.sh
diff --git a/tests/testsuite-summary-count-many.test b/t/testsuite-summary-count-many.sh
index 58157ad9b..58157ad9b 100755
--- a/tests/testsuite-summary-count-many.test
+++ b/t/testsuite-summary-count-many.sh
diff --git a/tests/testsuite-summary-count.test b/t/testsuite-summary-count.sh
index 1d13e7e6b..1d13e7e6b 100755
--- a/tests/testsuite-summary-count.test
+++ b/t/testsuite-summary-count.sh
diff --git a/tests/testsuite-summary-reference-log.test b/t/testsuite-summary-reference-log.sh
index 480ec12d6..480ec12d6 100755
--- a/tests/testsuite-summary-reference-log.test
+++ b/t/testsuite-summary-reference-log.sh
diff --git a/tests/transform.test b/t/transform.sh
index 7aa958ea0..7aa958ea0 100755
--- a/tests/transform.test
+++ b/t/transform.sh
diff --git a/tests/transform2.test b/t/transform2.sh
index a4a94f7a9..a4a94f7a9 100755
--- a/tests/transform2.test
+++ b/t/transform2.sh
diff --git a/tests/transform3.test b/t/transform3.sh
index aaa69cb8e..aaa69cb8e 100755
--- a/tests/transform3.test
+++ b/t/transform3.sh
diff --git a/tests/txinfo-no-clutter.test b/t/txinfo-no-clutter.sh
index ae5e9f2d1..ae5e9f2d1 100755
--- a/tests/txinfo-no-clutter.test
+++ b/t/txinfo-no-clutter.sh
diff --git a/tests/txinfo-unrecognized-extension.test b/t/txinfo-unrecognized-extension.sh
index 251658049..251658049 100755
--- a/tests/txinfo-unrecognized-extension.test
+++ b/t/txinfo-unrecognized-extension.sh
diff --git a/tests/txinfo.test b/t/txinfo.sh
index e6667cbed..e6667cbed 100755
--- a/tests/txinfo.test
+++ b/t/txinfo.sh
diff --git a/tests/txinfo10.test b/t/txinfo10.sh
index 6908ab847..6908ab847 100755
--- a/tests/txinfo10.test
+++ b/t/txinfo10.sh
diff --git a/tests/txinfo13.test b/t/txinfo13.sh
index 77f9af785..77f9af785 100755
--- a/tests/txinfo13.test
+++ b/t/txinfo13.sh
diff --git a/tests/txinfo16.test b/t/txinfo16.sh
index 173a87a86..173a87a86 100755
--- a/tests/txinfo16.test
+++ b/t/txinfo16.sh
diff --git a/tests/txinfo17.test b/t/txinfo17.sh
index 1de7e9a3f..1de7e9a3f 100755
--- a/tests/txinfo17.test
+++ b/t/txinfo17.sh
diff --git a/tests/txinfo19.test b/t/txinfo19.sh
index e304b42e2..e304b42e2 100755
--- a/tests/txinfo19.test
+++ b/t/txinfo19.sh
diff --git a/tests/txinfo2.test b/t/txinfo2.sh
index 0daebd9a8..0daebd9a8 100755
--- a/tests/txinfo2.test
+++ b/t/txinfo2.sh
diff --git a/tests/txinfo20.test b/t/txinfo20.sh
index 5c07880c1..5c07880c1 100755
--- a/tests/txinfo20.test
+++ b/t/txinfo20.sh
diff --git a/tests/txinfo21.test b/t/txinfo21.sh
index 93543a785..93543a785 100755
--- a/tests/txinfo21.test
+++ b/t/txinfo21.sh
diff --git a/tests/txinfo22.test b/t/txinfo22.sh
index c33898b67..c33898b67 100755
--- a/tests/txinfo22.test
+++ b/t/txinfo22.sh
diff --git a/tests/txinfo23.test b/t/txinfo23.sh
index e5c17611d..e5c17611d 100755
--- a/tests/txinfo23.test
+++ b/t/txinfo23.sh
diff --git a/tests/txinfo24.test b/t/txinfo24.sh
index 709cee71f..709cee71f 100755
--- a/tests/txinfo24.test
+++ b/t/txinfo24.sh
diff --git a/tests/txinfo25.test b/t/txinfo25.sh
index 7aa66ae9d..7aa66ae9d 100755
--- a/tests/txinfo25.test
+++ b/t/txinfo25.sh
diff --git a/tests/txinfo26.test b/t/txinfo26.sh
index e336bba79..e336bba79 100755
--- a/tests/txinfo26.test
+++ b/t/txinfo26.sh
diff --git a/tests/txinfo27.test b/t/txinfo27.sh
index 131300ae9..131300ae9 100755
--- a/tests/txinfo27.test
+++ b/t/txinfo27.sh
diff --git a/tests/txinfo28.test b/t/txinfo28.sh
index 97b36d50a..97b36d50a 100755
--- a/tests/txinfo28.test
+++ b/t/txinfo28.sh
diff --git a/tests/txinfo29.test b/t/txinfo29.sh
index a0013d252..a0013d252 100755
--- a/tests/txinfo29.test
+++ b/t/txinfo29.sh
diff --git a/tests/txinfo3.test b/t/txinfo3.sh
index 88e1bacfe..88e1bacfe 100755
--- a/tests/txinfo3.test
+++ b/t/txinfo3.sh
diff --git a/tests/txinfo30.test b/t/txinfo30.sh
index 09ebd5e18..09ebd5e18 100755
--- a/tests/txinfo30.test
+++ b/t/txinfo30.sh
diff --git a/tests/txinfo31.test b/t/txinfo31.sh
index 191bca4ee..191bca4ee 100755
--- a/tests/txinfo31.test
+++ b/t/txinfo31.sh
diff --git a/tests/txinfo32.test b/t/txinfo32.sh
index 7fa793858..7fa793858 100755
--- a/tests/txinfo32.test
+++ b/t/txinfo32.sh
diff --git a/tests/txinfo33.test b/t/txinfo33.sh
index 4bdd76734..4bdd76734 100755
--- a/tests/txinfo33.test
+++ b/t/txinfo33.sh
diff --git a/tests/txinfo4.test b/t/txinfo4.sh
index f92f9c1a4..f92f9c1a4 100755
--- a/tests/txinfo4.test
+++ b/t/txinfo4.sh
diff --git a/tests/txinfo5.test b/t/txinfo5.sh
index 9e42823ea..9e42823ea 100755
--- a/tests/txinfo5.test
+++ b/t/txinfo5.sh
diff --git a/tests/txinfo5b.test b/t/txinfo5b.sh
index c4eac537e..c4eac537e 100755
--- a/tests/txinfo5b.test
+++ b/t/txinfo5b.sh
diff --git a/tests/txinfo6.test b/t/txinfo6.sh
index b289efee4..b289efee4 100755
--- a/tests/txinfo6.test
+++ b/t/txinfo6.sh
diff --git a/tests/txinfo7.test b/t/txinfo7.sh
index 2a5dc9dc0..2a5dc9dc0 100755
--- a/tests/txinfo7.test
+++ b/t/txinfo7.sh
diff --git a/tests/txinfo8.test b/t/txinfo8.sh
index 4b186bc38..4b186bc38 100755
--- a/tests/txinfo8.test
+++ b/t/txinfo8.sh
diff --git a/tests/txinfo9.test b/t/txinfo9.sh
index eb2cbdcae..eb2cbdcae 100755
--- a/tests/txinfo9.test
+++ b/t/txinfo9.sh
diff --git a/tests/uninstall-fail.test b/t/uninstall-fail.sh
index aee1fb5b7..aee1fb5b7 100755
--- a/tests/uninstall-fail.test
+++ b/t/uninstall-fail.sh
diff --git a/tests/uninstall-pr9578.test b/t/uninstall-pr9578.sh
index 1ba6ac7ed..1ba6ac7ed 100755
--- a/tests/uninstall-pr9578.test
+++ b/t/uninstall-pr9578.sh
diff --git a/tests/unused.test b/t/unused.sh
index 271273fe5..271273fe5 100755
--- a/tests/unused.test
+++ b/t/unused.sh
diff --git a/tests/upc.test b/t/upc.sh
index 320e02fc7..320e02fc7 100755
--- a/tests/upc.test
+++ b/t/upc.sh
diff --git a/tests/upc2.test b/t/upc2.sh
index 43575d8cb..43575d8cb 100755
--- a/tests/upc2.test
+++ b/t/upc2.sh
diff --git a/tests/upc3.test b/t/upc3.sh
index eb026792c..eb026792c 100755
--- a/tests/upc3.test
+++ b/t/upc3.sh
diff --git a/tests/vala-mix.test b/t/vala-mix.sh
index 58ab50028..58ab50028 100755
--- a/tests/vala-mix.test
+++ b/t/vala-mix.sh
diff --git a/tests/vala-mix2.test b/t/vala-mix2.sh
index 516246724..516246724 100755
--- a/tests/vala-mix2.test
+++ b/t/vala-mix2.sh
diff --git a/tests/vala-vpath.test b/t/vala-vpath.sh
index a968afa0e..a968afa0e 100755
--- a/tests/vala-vpath.test
+++ b/t/vala-vpath.sh
diff --git a/tests/vala.test b/t/vala.sh
index 71c2ee6eb..71c2ee6eb 100755
--- a/tests/vala.test
+++ b/t/vala.sh
diff --git a/tests/vala1.test b/t/vala1.sh
index 9aca0fbc3..9aca0fbc3 100755
--- a/tests/vala1.test
+++ b/t/vala1.sh
diff --git a/tests/vala2.test b/t/vala2.sh
index cceed5495..cceed5495 100755
--- a/tests/vala2.test
+++ b/t/vala2.sh
diff --git a/tests/vala3.test b/t/vala3.sh
index c93db9a9b..c93db9a9b 100755
--- a/tests/vala3.test
+++ b/t/vala3.sh
diff --git a/tests/vala4.test b/t/vala4.sh
index 2e776edc7..2e776edc7 100755
--- a/tests/vala4.test
+++ b/t/vala4.sh
diff --git a/tests/vala5.test b/t/vala5.sh
index 79fb31623..79fb31623 100755
--- a/tests/vala5.test
+++ b/t/vala5.sh
diff --git a/tests/vars.test b/t/vars.sh
index 1e3e91e65..1e3e91e65 100755
--- a/tests/vars.test
+++ b/t/vars.sh
diff --git a/tests/vars3.test b/t/vars3.sh
index 246ea7095..246ea7095 100755
--- a/tests/vars3.test
+++ b/t/vars3.sh
diff --git a/tests/vartar.test b/t/vartar.sh
index ebac14ba0..ebac14ba0 100755
--- a/tests/vartar.test
+++ b/t/vartar.sh
diff --git a/tests/vartypo2.test b/t/vartypo2.sh
index 9b52df683..9b52df683 100755
--- a/tests/vartypo2.test
+++ b/t/vartypo2.sh
diff --git a/tests/vartypos.test b/t/vartypos.sh
index eb924cc06..eb924cc06 100755
--- a/tests/vartypos.test
+++ b/t/vartypos.sh
diff --git a/tests/version.test b/t/version.sh
index 98664e28c..98664e28c 100755
--- a/tests/version.test
+++ b/t/version.sh
diff --git a/tests/version2.test b/t/version2.sh
index 71749f64b..71749f64b 100755
--- a/tests/version2.test
+++ b/t/version2.sh
diff --git a/tests/version3.test b/t/version3.sh
index 2839467b4..2839467b4 100755
--- a/tests/version3.test
+++ b/t/version3.sh
diff --git a/tests/version4.test b/t/version4.sh
index 7fa429e17..7fa429e17 100755
--- a/tests/version4.test
+++ b/t/version4.sh
diff --git a/tests/version6.test b/t/version6.sh
index 1c04ab427..1c04ab427 100755
--- a/tests/version6.test
+++ b/t/version6.sh
diff --git a/tests/version7.test b/t/version7.sh
index 28929204b..28929204b 100755
--- a/tests/version7.test
+++ b/t/version7.sh
diff --git a/tests/version8.test b/t/version8.sh
index 1e66280d4..1e66280d4 100755
--- a/tests/version8.test
+++ b/t/version8.sh
diff --git a/tests/vpath.test b/t/vpath.sh
index 4bfc9be90..4bfc9be90 100755
--- a/tests/vpath.test
+++ b/t/vpath.sh
diff --git a/tests/vtexi.test b/t/vtexi.sh
index 9d1bc2448..9d1bc2448 100755
--- a/tests/vtexi.test
+++ b/t/vtexi.sh
diff --git a/tests/vtexi2.test b/t/vtexi2.sh
index 18f1e9ed1..18f1e9ed1 100755
--- a/tests/vtexi2.test
+++ b/t/vtexi2.sh
diff --git a/tests/vtexi3.test b/t/vtexi3.sh
index 9dd3e6712..9dd3e6712 100755
--- a/tests/vtexi3.test
+++ b/t/vtexi3.sh
diff --git a/tests/vtexi4.test b/t/vtexi4.sh
index 6038444b5..6038444b5 100755
--- a/tests/vtexi4.test
+++ b/t/vtexi4.sh
diff --git a/tests/warning-groups-win-over-strictness.test b/t/warning-groups-win-over-strictness.sh
index 3d3885d45..3d3885d45 100755
--- a/tests/warning-groups-win-over-strictness.test
+++ b/t/warning-groups-win-over-strictness.sh
diff --git a/tests/warnings-override.test b/t/warnings-override.sh
index 9f973c6db..9f973c6db 100755
--- a/tests/warnings-override.test
+++ b/t/warnings-override.sh
diff --git a/tests/warnings-precedence.test b/t/warnings-precedence.sh
index a5886701a..a5886701a 100755
--- a/tests/warnings-precedence.test
+++ b/t/warnings-precedence.sh
diff --git a/tests/warnings-strictness-interactions.test b/t/warnings-strictness-interactions.sh
index 774fd3aae..774fd3aae 100755
--- a/tests/warnings-strictness-interactions.test
+++ b/t/warnings-strictness-interactions.sh
diff --git a/tests/warnings-unknown.test b/t/warnings-unknown.sh
index 4d64059e0..4d64059e0 100755
--- a/tests/warnings-unknown.test
+++ b/t/warnings-unknown.sh
diff --git a/tests/warnings-win-over-strictness.test b/t/warnings-win-over-strictness.sh
index 5d47f5047..5d47f5047 100755
--- a/tests/warnings-win-over-strictness.test
+++ b/t/warnings-win-over-strictness.sh
diff --git a/tests/warnopts.test b/t/warnopts.sh
index 1662d91d6..1662d91d6 100755
--- a/tests/warnopts.test
+++ b/t/warnopts.sh
diff --git a/tests/werror.test b/t/werror.sh
index 606fed620..606fed620 100755
--- a/tests/werror.test
+++ b/t/werror.sh
diff --git a/tests/werror2.test b/t/werror2.sh
index 67e0e01f7..67e0e01f7 100755
--- a/tests/werror2.test
+++ b/t/werror2.sh
diff --git a/tests/werror3.test b/t/werror3.sh
index b5e35e370..b5e35e370 100755
--- a/tests/werror3.test
+++ b/t/werror3.sh
diff --git a/tests/werror4.test b/t/werror4.sh
index b2f3f6a78..b2f3f6a78 100755
--- a/tests/werror4.test
+++ b/t/werror4.sh
diff --git a/tests/whoami.test b/t/whoami.sh
index 72153cada..72153cada 100755
--- a/tests/whoami.test
+++ b/t/whoami.sh
diff --git a/tests/wrap/aclocal.in b/t/wrap/aclocal.in
index 18ee13a82..18ee13a82 100644
--- a/tests/wrap/aclocal.in
+++ b/t/wrap/aclocal.in
diff --git a/tests/wrap/automake.in b/t/wrap/automake.in
index 14f437f1e..14f437f1e 100644
--- a/tests/wrap/automake.in
+++ b/t/wrap/automake.in
diff --git a/tests/xsource.test b/t/xsource.sh
index 5f89dc9c6..5f89dc9c6 100755
--- a/tests/xsource.test
+++ b/t/xsource.sh
diff --git a/tests/yacc-auxdir.test b/t/yacc-auxdir.sh
index 1b494e82c..1b494e82c 100755
--- a/tests/yacc-auxdir.test
+++ b/t/yacc-auxdir.sh
diff --git a/tests/yacc-basic.test b/t/yacc-basic.sh
index 71a17e58e..71a17e58e 100755
--- a/tests/yacc-basic.test
+++ b/t/yacc-basic.sh
diff --git a/tests/yacc-bison-skeleton-cxx.test b/t/yacc-bison-skeleton-cxx.sh
index 30f254340..30f254340 100755
--- a/tests/yacc-bison-skeleton-cxx.test
+++ b/t/yacc-bison-skeleton-cxx.sh
diff --git a/tests/yacc-bison-skeleton.test b/t/yacc-bison-skeleton.sh
index b341401d3..b341401d3 100755
--- a/tests/yacc-bison-skeleton.test
+++ b/t/yacc-bison-skeleton.sh
diff --git a/tests/yacc-clean-cxx.test b/t/yacc-clean-cxx.sh
index ea21bffd7..ea21bffd7 100755
--- a/tests/yacc-clean-cxx.test
+++ b/t/yacc-clean-cxx.sh
diff --git a/tests/yacc-clean.test b/t/yacc-clean.sh
index 530f87fb1..530f87fb1 100755
--- a/tests/yacc-clean.test
+++ b/t/yacc-clean.sh
diff --git a/tests/yacc-cxx.test b/t/yacc-cxx.sh
index fe348cb20..fe348cb20 100755
--- a/tests/yacc-cxx.test
+++ b/t/yacc-cxx.sh
diff --git a/tests/yacc-d-basic.test b/t/yacc-d-basic.sh
index a633f411a..a633f411a 100755
--- a/tests/yacc-d-basic.test
+++ b/t/yacc-d-basic.sh
diff --git a/tests/yacc-d-cxx.test b/t/yacc-d-cxx.sh
index 51d78f1b3..51d78f1b3 100755
--- a/tests/yacc-d-cxx.test
+++ b/t/yacc-d-cxx.sh
diff --git a/tests/yacc-d-vpath.test b/t/yacc-d-vpath.sh
index 78a486a70..78a486a70 100755
--- a/tests/yacc-d-vpath.test
+++ b/t/yacc-d-vpath.sh
diff --git a/tests/yacc-deleted-headers.test b/t/yacc-deleted-headers.sh
index 5ab8d871a..5ab8d871a 100755
--- a/tests/yacc-deleted-headers.test
+++ b/t/yacc-deleted-headers.sh
diff --git a/tests/yacc-depend.test b/t/yacc-depend.sh
index 73d64ad12..73d64ad12 100755
--- a/tests/yacc-depend.test
+++ b/t/yacc-depend.sh
diff --git a/tests/yacc-depend2.test b/t/yacc-depend2.sh
index 879cc5911..879cc5911 100755
--- a/tests/yacc-depend2.test
+++ b/t/yacc-depend2.sh
diff --git a/tests/yacc-dist-nobuild-subdir.test b/t/yacc-dist-nobuild-subdir.sh
index 3fdae8d2a..3fdae8d2a 100755
--- a/tests/yacc-dist-nobuild-subdir.test
+++ b/t/yacc-dist-nobuild-subdir.sh
diff --git a/tests/yacc-dist-nobuild.test b/t/yacc-dist-nobuild.sh
index 6f02f1109..6f02f1109 100755
--- a/tests/yacc-dist-nobuild.test
+++ b/t/yacc-dist-nobuild.sh
diff --git a/tests/yacc-line.test b/t/yacc-line.sh
index ac6a0aa98..ac6a0aa98 100755
--- a/tests/yacc-line.test
+++ b/t/yacc-line.sh
diff --git a/tests/yacc-mix-c-cxx.test b/t/yacc-mix-c-cxx.sh
index 8f72b35c4..8f72b35c4 100755
--- a/tests/yacc-mix-c-cxx.test
+++ b/t/yacc-mix-c-cxx.sh
diff --git a/tests/yacc-nodist.test b/t/yacc-nodist.sh
index 2124357d5..2124357d5 100755
--- a/tests/yacc-nodist.test
+++ b/t/yacc-nodist.sh
diff --git a/tests/yacc-pr204.test b/t/yacc-pr204.sh
index 6507b5103..6507b5103 100755
--- a/tests/yacc-pr204.test
+++ b/t/yacc-pr204.sh
diff --git a/tests/yacc-weirdnames.test b/t/yacc-weirdnames.sh
index 82270fe96..82270fe96 100755
--- a/tests/yacc-weirdnames.test
+++ b/t/yacc-weirdnames.sh
diff --git a/tests/yacc.test b/t/yacc.sh
index 60b5a4ffc..60b5a4ffc 100755
--- a/tests/yacc.test
+++ b/t/yacc.sh
diff --git a/tests/yacc2.test b/t/yacc2.sh
index bfab7522d..bfab7522d 100755
--- a/tests/yacc2.test
+++ b/t/yacc2.sh
diff --git a/tests/yacc4.test b/t/yacc4.sh
index 3f9a20478..3f9a20478 100755
--- a/tests/yacc4.test
+++ b/t/yacc4.sh
diff --git a/tests/yacc5.test b/t/yacc5.sh
index ab24b563d..ab24b563d 100755
--- a/tests/yacc5.test
+++ b/t/yacc5.sh
diff --git a/tests/yacc7.test b/t/yacc7.sh
index a3602e9fa..a3602e9fa 100755
--- a/tests/yacc7.test
+++ b/t/yacc7.sh
diff --git a/tests/yacc8.test b/t/yacc8.sh
index bab627dfb..bab627dfb 100755
--- a/tests/yacc8.test
+++ b/t/yacc8.sh
diff --git a/tests/yaccdry.test b/t/yaccdry.sh
index 3100ce360..3100ce360 100755
--- a/tests/yaccdry.test
+++ b/t/yaccdry.sh
diff --git a/tests/yaccpp.test b/t/yaccpp.sh
index c065a50da..c065a50da 100755
--- a/tests/yaccpp.test
+++ b/t/yaccpp.sh
diff --git a/tests/yaccvpath.test b/t/yaccvpath.sh
index 65ab53bf9..65ab53bf9 100755
--- a/tests/yaccvpath.test
+++ b/t/yaccvpath.sh
diff --git a/tests/yflags-cmdline-override.test b/t/yflags-cmdline-override.sh
index fb27c0bab..fb27c0bab 100755
--- a/tests/yflags-cmdline-override.test
+++ b/t/yflags-cmdline-override.sh
diff --git a/tests/yflags-conditional.test b/t/yflags-conditional.sh
index 0cd09d29a..0cd09d29a 100755
--- a/tests/yflags-conditional.test
+++ b/t/yflags-conditional.sh
diff --git a/tests/yflags-d-false-positives.test b/t/yflags-d-false-positives.sh
index 78820caba..78820caba 100755
--- a/tests/yflags-d-false-positives.test
+++ b/t/yflags-d-false-positives.sh
diff --git a/tests/yflags-force-conditional.test b/t/yflags-force-conditional.sh
index 53038a82a..53038a82a 100755
--- a/tests/yflags-force-conditional.test
+++ b/t/yflags-force-conditional.sh
diff --git a/tests/yflags-force-override.test b/t/yflags-force-override.sh
index 3f4755ed1..3f4755ed1 100755
--- a/tests/yflags-force-override.test
+++ b/t/yflags-force-override.sh
diff --git a/tests/yflags-var-expand.test b/t/yflags-var-expand.sh
index d3bd0d447..d3bd0d447 100755
--- a/tests/yflags-var-expand.test
+++ b/t/yflags-var-expand.sh
diff --git a/tests/yflags.test b/t/yflags.sh
index fbc39f56f..fbc39f56f 100755
--- a/tests/yflags.test
+++ b/t/yflags.sh
diff --git a/tests/yflags2.test b/t/yflags2.sh
index a933447d3..a933447d3 100755
--- a/tests/yflags2.test
+++ b/t/yflags2.sh
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index 7b04f170d..000000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/aclocal-*
-/automake-*
-/defs-static
-/testsuite-part.am
-/*-w.tap
-/*-w.test
-/*.dir
-/*.log
-/*.trs
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
deleted file mode 100644
index 9dd45ab4f..000000000
--- a/tests/list-of-tests.mk
+++ /dev/null
@@ -1,1274 +0,0 @@
-## Makefile fragment that holds the list of test scripts of the automake
-## testsuite.  This fragment is meant to be included by the Makefile.am,
-## but also to be executed directly by make when bootstrapping automake.
-
-## Copyright (C) 2011-2012 Free Software Foundation, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# FIXME: this "expected failures" are in truth an hack used to
-# FIXME: to verify that some incorrect usages of our perl libraries
-# FIXME: raise an error.  We should find a cleaner way to check that.
-perl_fake_XFAIL_TESTS = \
-pm/Cond2.pl \
-pm/Cond3.pl \
-pm/DisjCon2.pl \
-pm/DisjCon3.pl \
-pm/Version2.pl \
-pm/Version3.pl
-
-XFAIL_TESTS = \
-all.test \
-yacc-bison-skeleton-cxx.test \
-yacc-bison-skeleton.test \
-cond17.test \
-gcj6.test \
-override-conditional-2.test \
-dist-pr109765.test \
-instdir-cond2.test \
-java-nobase.test \
-objext-pr10128.test \
-parallel-tests-many.test \
-pr8365-remake-timing.test \
-lex-subobj-nodep.test \
-remake-am-pr10111.test \
-remake-m4-pr10111.test \
-txinfo5.test \
-$(perl_fake_XFAIL_TESTS)
-
-perl_TESTS = \
-pm/Cond2.pl \
-pm/Cond3.pl \
-pm/Condition.pl \
-pm/Condition-t.pl \
-pm/DisjCon2.pl \
-pm/DisjCon3.pl \
-pm/DisjConditions.pl \
-pm/DisjConditions-t.pl \
-pm/Version.pl \
-pm/Version2.pl \
-pm/Version3.pl \
-pm/Wrap.pl
-
-# The order here is mostly alphabetical, with the deliberate exception
-# that tests having a high runtime (especially TAP tests that run various
-# checks sequentially) are listed early; this improves performance on
-# concurrent testsuite runs.
-handwritten_TESTS = \
-get-sysconf.test \
-$(perl_TESTS) \
-instspc.tap \
-aclocal.test \
-aclocal3.test \
-aclocal4.test \
-aclocal5.test \
-aclocal6.test \
-aclocal7.test \
-aclocal8.test \
-aclocal9.test \
-acloca10.test \
-acloca11.test \
-acloca12.test \
-acloca13.test \
-acloca14.test \
-acloca15.test \
-acloca16.test \
-acloca17.test \
-acloca18.test \
-acloca19.test \
-acloca20.test \
-acloca21.test \
-acloca22.test \
-acloca23.test \
-aclocal-acdir.test \
-aclocal-install-absdir.test \
-aclocal-print-acdir.test \
-aclocal-path.test \
-aclocal-path-install.test \
-aclocal-path-install-serial.test \
-aclocal-path-nonexistent.test \
-aclocal-path-precedence.test \
-aclocal-install-fail.test \
-aclocal-install-mkdir.test \
-aclocal-no-install-no-mkdir.test \
-aclocal-verbose-install.test \
-ac-output-old.tap \
-acsilent.test \
-acsubst.test \
-acsubst2.test \
-add-missing.tap \
-all.test \
-all2.test \
-alloca.test \
-alloca2.test \
-alpha.test \
-alpha2.test \
-amhello-cflags.test \
-amhello-cross-compile.test \
-amhello-binpkg.test \
-amassign.test \
-ammissing.test \
-amopt.test \
-amopts-location.test \
-amopts-variable-expansion.test \
-amsubst.test \
-ansi2knr-no-more.test \
-ar-lib.test \
-ar-lib2.test \
-ar-lib3.test \
-ar-lib4.test \
-ar-lib5a.test \
-ar-lib5b.test \
-ar-lib6a.test \
-ar-lib6b.test \
-ar-lib7.test \
-ar.test \
-ar2.test \
-ar3.test \
-ar4.test \
-ar5.test \
-asm.test \
-asm2.test \
-asm3.test \
-autodist.test \
-autodist-subdir.test \
-autodist-acconfig.test \
-autodist-acconfig-no-subdir.test \
-autodist-aclocal-m4.test \
-autodist-config-headers.test \
-autodist-configure-no-subdir.test \
-autodist-no-duplicate.test \
-autodist-stamp-vti.test \
-autohdr.test \
-autohdr2.test \
-autohdr3.test \
-autohdr4.test \
-autohdrdry.test \
-automake-cmdline.tap \
-auxdir.test \
-auxdir6.test \
-auxdir7.test \
-auxdir8.test \
-auxdir-autodetect.test \
-auxdir-computed.tap \
-auxdir-misplaced.test \
-auxdir-nonexistent.test \
-auxdir-unportable.tap \
-backcompat.test \
-backcompat2.test \
-backcompat3.test \
-backcompat4.test \
-backcompat5.test \
-backcompat6.test \
-backsl.test \
-backsl2.test \
-backsl3.test \
-backsl4.test \
-badline.test \
-badopt.test \
-badprog.test \
-block.test \
-bsource.test \
-candist.test \
-canon.test \
-canon2.test \
-canon3.test \
-canon4.test \
-canon5.test \
-canon6.test \
-canon7.test \
-canon8.test \
-canon-name.test \
-ccnoco.test \
-ccnoco2.test \
-ccnoco3.test \
-check.test \
-check2.test \
-check3.test \
-check4.test \
-check5.test \
-check6.test \
-check7.test \
-check8.test \
-check10.test \
-check11.test \
-check12.test \
-check-subst.test \
-check-subst-prog.test \
-check-exported-srcdir.test \
-check-fd-redirect.test \
-check-tests-in-builddir.test \
-check-no-test-driver.test \
-check-concurrency-bug9245.test \
-checkall.test \
-clean.test \
-clean2.test \
-colneq.test \
-colneq2.test \
-colneq3.test \
-colon.test \
-colon2.test \
-colon3.test \
-colon4.test \
-colon5.test \
-colon6.test \
-colon7.test \
-color.test \
-color2.test \
-comment.test \
-comment2.test \
-comment3.test \
-comment4.test \
-comment5.test \
-comment6.test \
-comment7.test \
-comment8.test \
-comment9.test \
-commen10.test \
-commen11.test \
-comments-in-var-def.test \
-compile.test \
-compile2.test \
-compile3.test \
-compile4.test \
-compile5.test \
-compile6.test \
-compile_f90_c_cxx.test \
-compile_f_c_cxx.test \
-cond-basic.test \
-cond.test \
-cond2.test \
-cond3.test \
-cond4.test \
-cond5.test \
-cond6.test \
-cond7.test \
-cond8.test \
-cond9.test \
-cond10.test \
-cond11.test \
-cond13.test \
-cond14.test \
-cond15.test \
-cond16.test \
-cond17.test \
-cond18.test \
-cond19.test \
-cond20.test \
-cond21.test \
-cond22.test \
-cond23.test \
-cond24.test \
-cond25.test \
-cond26.test \
-cond27.test \
-cond28.test \
-cond29.test \
-cond30.test \
-cond31.test \
-cond32.test \
-cond33.test \
-cond34.test \
-cond35.test \
-cond36.test \
-cond37.test \
-cond38.test \
-cond39.test \
-cond40.test \
-cond41.test \
-cond42.test \
-cond43.test \
-cond44.test \
-cond45.test \
-cond46.test \
-condd.test \
-condhook.test \
-condhook2.test \
-condinc.test \
-condinc2.test \
-condlib.test \
-condman2.test \
-condman3.test \
-configure.test \
-confdeps.test \
-conff.test \
-conff2.test \
-conffile-leading-dot.test \
-confh.test \
-confh4.test \
-confh5.test \
-confh6.test \
-confh7.test \
-confh8.test \
-confincl.test \
-conflnk.test \
-conflnk2.test \
-conflnk3.test \
-conflnk4.test \
-confsub.test \
-confvar.test \
-confvar2.test \
-copy.test \
-cscope.tap \
-cscope2.test \
-cscope3.test \
-cxx.test \
-cxx2.test \
-cxxcpp.test \
-cxxlibobj.test \
-cxxlink.test \
-cxxnoc.test \
-cxxo.test \
-cygnus-check-without-all.test \
-cygnus-dependency-tracking.test \
-cygnus-imply-foreign.test \
-cygnus-no-dist.test \
-cygnus-no-installinfo.test \
-cygnus-requires-maintainer-mode.test \
-cygwin32.test \
-dash.test \
-defun.test \
-defun2.test \
-dejagnu.test \
-dejagnu2.test \
-dejagnu3.test \
-dejagnu4.test \
-dejagnu5.test \
-dejagnu6.test \
-dejagnu7.test \
-dejagnu-absolute-builddir.test \
-dejagnu-relative-srcdir.test \
-dejagnu-siteexp-extend.test \
-dejagnu-siteexp-append.test \
-dejagnu-siteexp-useredit.test \
-deleted-am.test \
-deleted-m4.test \
-depacl2.test \
-depcomp.test \
-depcomp2.test \
-depcomp8a.test \
-depcomp8b.test \
-depdist.test \
-depend.test \
-depend3.test \
-depend4.test \
-depend5.test \
-depend6.test \
-deprecated-acinit.test \
-destdir.test \
-dirlist.test \
-dirlist2.test \
-dirlist-abspath.test \
-discover.test \
-dist-formats.tap \
-dist-auxdir-many-subdirs.test \
-dist-auxfile-2.test \
-dist-auxfile.test \
-dist-included-parent-dir.test \
-dist-missing-am.test \
-dist-missing-included-m4.test \
-dist-missing-m4.test \
-dist-readonly.test \
-dist-repeated.test \
-dist-pr109765.test \
-distcleancheck.test \
-distcom2.test \
-distcom3.test \
-distcom4.test \
-distcom5.test \
-distcom-subdir.test \
-distdir.test \
-disthook.test \
-distlinks.test \
-distlinksbrk.test \
-distname.test \
-distcheck-configure-flags.test \
-distcheck-configure-flags-am.test \
-distcheck-configure-flags-subpkg.test \
-distcheck-hook.test \
-distcheck-hook2.test \
-distcheck-writable-srcdir.test \
-distcheck-missing-m4.test \
-distcheck-outdated-m4.test \
-distcheck-override-infodir.test \
-distcheck-pr9579.test \
-distcheck-pr10470.test \
-dmalloc.test \
-doc-parsing-buglets-colneq-subst.test \
-doc-parsing-buglets-tabs.test \
-dollar.test \
-dollarvar.test \
-dollarvar2.test \
-double.test \
-dup2.test \
-else.test \
-empty.test \
-empty2.test \
-empty3.test \
-empty4.test \
-exdir.test \
-exdir2.test \
-exdir3.test \
-exeext.test \
-exeext2.test \
-exeext3.test \
-exeext4.test \
-exsource.test \
-ext.test \
-ext2.test \
-ext3.test \
-extra.test \
-extra2.test \
-extra3.test \
-extra4.test \
-extra5.test \
-extra6.test \
-extra7.test \
-extra8.test \
-extra9.test \
-extra10.test \
-extra11.test \
-extra12.test \
-extra-programs-empty.test \
-extra-portability.test \
-extra-portability2.test \
-extra-portability3.test \
-extradep.test \
-extradep2.test \
-f90only.test \
-flavor.test \
-flibs.test \
-fn99.test \
-fn99subdir.test \
-fnoc.test \
-fo.test \
-forcemiss.test \
-forcemiss2.test \
-fort1.test \
-fort2.test \
-fort4.test \
-fort5.test \
-fonly.test \
-fortdep.test \
-gcj.test \
-gcj2.test \
-gcj3.test \
-gcj4.test \
-gcj5.test \
-gcj6.test \
-gettext.test \
-gettext2.test \
-gettext3.test \
-gnumake.test \
-gnuwarn.test \
-gnuwarn2.test \
-gnits.test \
-gnits2.test \
-gnits3.test \
-hdr-vars-defined-once.test \
-header.test \
-help.test \
-help2.test \
-help3.test \
-help4.test \
-help-depend.test \
-help-depend2.test \
-help-dmalloc.test \
-help-init.test \
-help-lispdir.test \
-help-multilib.test \
-help-python.test \
-help-silent.test \
-help-upc.test \
-hfs.test \
-implicit.test \
-info.test \
-init.test \
-init2.test \
-insh2.test \
-install2.test \
-installdir.test \
-instsh.test \
-instsh2.test \
-instsh3.test \
-instdat.test \
-instdat2.test \
-instdir.test \
-instdir2.test \
-instdir-cond.test \
-instdir-cond2.test \
-instdir-no-empty.test \
-instdir-java.test \
-instdir-lisp.test \
-instdir-ltlib.test \
-instdir-prog.test \
-instdir-python.test \
-instdir-texi.test \
-instexec.test \
-instfail.test \
-instfail-info.test \
-instfail-java.test \
-instfail-libtool.test \
-insthook.test \
-instman.test \
-instman2.test \
-instmany.test \
-instmany-mans.test \
-instmany-python.test \
-install-info-dir.test \
-interp.test \
-interp2.test \
-java.test \
-java2.test \
-java3.test \
-javadir-undefined.test \
-javaflags.test \
-java-check.test \
-java-clean.test \
-java-compile-install.test \
-java-compile-run-flat.test \
-java-compile-run-nested.test \
-java-empty-classpath.test \
-javaprim.test \
-javasubst.test \
-java-extra.test \
-java-mix.test \
-java-no-duplicate.test \
-java-nobase.test \
-java-noinst.test \
-java-rebuild.test \
-java-sources.test \
-java-uninstall.test \
-ldadd.test \
-ldflags.test \
-lex.test \
-lex2.test \
-lex3.test \
-lex5.test \
-lexcpp.test \
-lexvpath.test \
-lex-subobj-nodep.test \
-lex-lib.test \
-lex-lib-external.test \
-lex-libobj.test \
-lex-noyywrap.test \
-lex-clean-cxx.test \
-lex-clean.test \
-lex-depend-cxx.test \
-lex-depend-grep.test \
-lex-depend.test \
-lex-line.test \
-lex-nodist.test \
-lex-pr204.test \
-lflags.test \
-lflags2.test \
-libexec.test \
-libobj-basic.test \
-libobj2.test \
-libobj3.test \
-libobj4.test \
-libobj5.test \
-libobj7.test \
-libobj10.test \
-libobj12.test \
-libobj13.test \
-libobj14.test \
-libobj15a.test \
-libobj15b.test \
-libobj15c.test \
-libobj16a.test \
-libobj16b.test \
-libobj17.test \
-libobj18.test \
-libobj19.test \
-libobj20a.test \
-libobj20b.test \
-libobj20c.test \
-library.test \
-library2.test \
-library3.test \
-libtool.test \
-libtool2.test \
-libtool3.test \
-libtool4.test \
-libtool5.test \
-libtool6.test \
-libtool7.test \
-libtool8.test \
-libtool9.test \
-libtoo10.test \
-libtoo11.test \
-license.test \
-license2.test \
-link_c_cxx.test \
-link_cond.test \
-link_dist.test \
-link_f90_only.test \
-link_fc.test \
-link_fccxx.test \
-link_fcxx.test \
-link_f_only.test \
-link_override.test \
-lisp2.test \
-lisp3.test \
-lisp4.test \
-lisp5.test \
-lisp6.test \
-lisp7.test \
-lisp8.test \
-lispdry.test \
-listval.test \
-location.test \
-longline.test \
-longlin2.test \
-ltcond.test \
-ltcond2.test \
-ltconv.test \
-ltdeps.test \
-ltinit.test \
-ltinstloc.test \
-ltlibobjs.test \
-ltlibsrc.test \
-ltorder.test \
-lzma.test \
-m4-inclusion.test \
-maintclean.test \
-maintclean-vpath.test \
-maintmode-configure-msg.test \
-make.test \
-makefile-deps.test \
-makej.test \
-makej2.test \
-maken.test \
-maken3.test \
-make-dryrun.tap \
-makevars.test \
-man.test \
-man2.test \
-man3.test \
-man4.test \
-man5.test \
-man6.test \
-man7.test \
-man8.test \
-mdate.test \
-mdate2.test \
-mdate3.test \
-mdate4.test \
-mdate5.test \
-mdate6.test \
-missing.test \
-missing2.test \
-missing3.test \
-missing4.test \
-missing5.test \
-missing6.test \
-missing-auxfile-stops-makefiles-creation.test \
-mkinstall.test \
-mkinst2.test \
-mkinst3.test \
-mmode.test \
-mmodely.test \
-multlib.test \
-no-extra-makefile-code.test \
-no-outdir-option.test \
-nobase.test \
-nobase-libtool.test \
-nobase-python.test \
-nobase-nodist.test \
-nodef.test \
-nodef2.test \
-nodep.test \
-nodep2.test \
-nodepcomp.test \
-nodist.test \
-nodist2.test \
-nodist3.test \
-noinst.test \
-noinstdir.test \
-nolink.test \
-nostdinc.test \
-notrans.test \
-number.test \
-objc.test \
-objc2.test \
-objext-pr10128.test \
-obsolete.test \
-oldvars.test \
-order.test \
-output.test \
-output2.test \
-output3.test \
-output4.test \
-output5.test \
-output6.test \
-output7.test \
-output8.test \
-output9.test \
-output10.test \
-output11.test \
-output12.test \
-output13.test \
-output-order.test \
-override-conditional-1.test \
-override-conditional-2.test \
-override-html.test \
-override-suggest-local.test \
-parallel-am.test \
-parallel-am2.test \
-parallel-am3.test \
-serial-tests.test \
-parallel-tests.test \
-parallel-tests2.test \
-parallel-tests3.test \
-parallel-tests5.test \
-parallel-tests6.test \
-parallel-tests8.test \
-parallel-tests9.test \
-parallel-tests10.test \
-parallel-tests-exeext.test \
-parallel-tests-suffix.test \
-parallel-tests-suffix-prog.test \
-parallel-tests-log-compiler-1.test \
-parallel-tests-log-compiler-2.test \
-parallel-tests-dry-run-1.test \
-parallel-tests-dry-run-2.test \
-parallel-tests-fd-redirect.test \
-parallel-tests-fd-redirect-exeext.test \
-parallel-tests-extra-programs.test \
-parallel-tests-unreadable.test \
-parallel-tests-subdir.test \
-parallel-tests-interrupt.tap \
-parallel-tests-reset-term.test \
-parallel-tests-harderror.test \
-parallel-tests-log-override-1.test \
-parallel-tests-log-override-2.test \
-parallel-tests-log-override-recheck.test \
-parallel-tests-log-compiler-example.test \
-parallel-tests-cmdline-override.test \
-parallel-tests-fork-bomb.test \
-parallel-tests-empty-testlogs.test \
-parallel-tests-driver-install.test \
-parallel-tests-no-color-in-log.test \
-parallel-tests-no-spurious-summary.test \
-parallel-tests-exit-statuses.test \
-parallel-tests-console-output.test \
-parallel-tests-once.test \
-parallel-tests-trailing-bslash.test \
-parallel-tests-many.test \
-tests-environment.test \
-am-tests-environment.test \
-tests-environment-backcompat.test \
-testsuite-summary-color.test \
-testsuite-summary-count.test \
-testsuite-summary-count-many.test \
-testsuite-summary-reference-log.test \
-test-driver-acsubst.test \
-test-driver-cond.test \
-test-driver-custom-no-extra-driver.test \
-test-driver-custom.test \
-test-driver-custom-xfail-tests.test \
-test-driver-custom-multitest.test \
-test-driver-custom-multitest-recheck.test \
-test-driver-custom-multitest-recheck2.test \
-test-driver-create-log-dir.test \
-test-driver-strip-vpath.test \
-test-driver-trs-suffix-registered.test \
-test-driver-fail.test \
-test-driver-is-distributed.test \
-test-harness-vpath-rewrite.test \
-test-log.test \
-test-logs-repeated.test \
-test-metadata-global-log.test \
-test-metadata-global-result.test \
-test-metadata-recheck.test \
-test-metadata-results.test \
-test-missing.test \
-test-missing2.test \
-test-trs-basic.test \
-test-trs-recover.test \
-test-trs-recover2.test \
-test-extensions.test \
-test-extensions-cond.test \
-parse.test \
-percent.test \
-percent2.test \
-phony.test \
-pluseq.test \
-pluseq2.test \
-pluseq3.test \
-pluseq4.test \
-pluseq5.test \
-pluseq6.test \
-pluseq7.test \
-pluseq8.test \
-pluseq9.test \
-pluseq10.test \
-pluseq11.test \
-posixsubst-data.test \
-posixsubst-extradist.test \
-posixsubst-ldadd.test \
-posixsubst-libraries.test \
-posixsubst-ltlibraries.test \
-posixsubst-programs.test \
-posixsubst-scripts.test \
-posixsubst-sources.test \
-posixsubst-tests.test \
-postproc.test \
-ppf77.test \
-pr2.test \
-pr9.test \
-pr72.test \
-pr87.test \
-pr211.test \
-pr220.test \
-pr224.test \
-pr229.test \
-pr243.test \
-pr266.test \
-pr279.test \
-pr279-2.test \
-pr287.test \
-pr300-lib.test \
-pr300-ltlib.test \
-pr300-prog.test \
-pr307.test \
-pr401.test \
-pr401b.test \
-pr401c.test \
-prefix.test \
-primary.test \
-primary2.test \
-primary3.test \
-primary-prefix-invalid-couples.tap \
-primary-prefix-valid-couples.test \
-primary-prefix-couples-force-valid.test \
-primary-prefix-couples-documented-valid.test \
-print-libdir.test \
-proginst.test \
-programs-primary-rewritten.test \
-py-compile-basic.test \
-py-compile-basic2.test \
-py-compile-basedir.test \
-py-compile-destdir.test \
-py-compile-env.test \
-py-compile-option-terminate.test \
-py-compile-usage.test \
-python.test \
-python2.test \
-python3.test \
-python4.test \
-python5.test \
-python5b.test \
-python6.test \
-python7.test \
-python8.test \
-python9.test \
-python10.test \
-python11.test \
-python12.test \
-python-dist.test \
-python-vars.test \
-python-virtualenv.test \
-python-pr10995.test \
-recurs.test \
-recurs2.test \
-remake.test \
-remake1a.test \
-remake2.test \
-remake3.test \
-remake3a.test \
-remake4.test \
-remake5.test \
-remake6.test \
-remake7.test \
-remake8a.test \
-remake8b.test \
-remake9a.test \
-remake9b.test \
-remake9c.test \
-remake9d.test \
-remake10a.test \
-remake10b.test \
-remake10c.test \
-remake11.test \
-remake12.test \
-remake-all-1.test \
-remake-all-2.test \
-remake-subdir-from-subdir.test \
-remake-subdir-gnu.test \
-remake-subdir.test \
-remake-subdir2.test \
-remake-subdir-long-time.test \
-remake-gnulib-add-acsubst.test \
-remake-gnulib-add-header.test \
-remake-gnulib-remove-header.test \
-remake-moved-m4-file.test \
-remake-deleted-m4-file.test \
-remake-renamed-m4-file.test \
-remake-renamed-m4-macro-and-file.test \
-remake-renamed-m4-macro.test \
-remake-am-pr10111.test \
-remake-m4-pr10111.test \
-remake-deleted-am-2.test \
-remake-deleted-am-subdir.test \
-remake-deleted-am.test \
-remake-renamed-am.test \
-pr8365-remake-timing.test \
-req.test \
-reqd.test \
-reqd2.test \
-repeated-options.test \
-rst-formatting.test \
-rulepat.test \
-self-check-cleanup.tap \
-self-check-configure-help.test \
-self-check-dir.tap \
-self-check-env-sanitize.tap \
-self-check-exit.tap \
-self-check-explicit-skips.test \
-self-check-is_newest.tap \
-self-check-me.tap \
-self-check-reexec.tap \
-self-check-report.test \
-self-check-sanity.test \
-self-check-seq.tap \
-self-check-is-blocked-signal.tap \
-self-check-tap.test \
-self-check-unindent.tap \
-sanity.test \
-scripts.test \
-seenc.test \
-silent.test \
-silent2.test \
-silent3.test \
-silent4.test \
-silent6.test \
-silent7.test \
-silent8.test \
-silent9.test \
-silentcxx.test \
-silentcxx-gcc.test \
-silentf77.test \
-silentf90.test \
-silent-amopts.test \
-silent-many-gcc.test \
-silent-many-generic.test \
-silent-nowarn.test \
-silent-configsite.test \
-silent-nested-vars.test \
-silent-lex.test \
-silent-yacc.test \
-silent-yacc-headers.test \
-srcsub.test \
-srcsub2.test \
-space.test \
-specflg.test \
-specflg2.test \
-specflg3.test \
-specflg6.test \
-specflg7.test \
-specflg8.test \
-specflg9.test \
-specflg10.test \
-specflg-dummy.test \
-spell.test \
-spell2.test \
-spell3.test \
-spelling.test \
-spy.test \
-spy-rm.tap \
-stdinc.test \
-stamph2.test \
-stdlib.test \
-stdlib2.test \
-strictness-override.test \
-strictness-precedence.test \
-strip.test \
-strip2.test \
-strip3.test \
-subdir.test \
-subdir2.test \
-subdir3.test \
-subdir4.test \
-subdir5.test \
-subdir6.test \
-subdir7.test \
-subdir8.test \
-subdir9.test \
-subdir10.test \
-subdirbuiltsources.test \
-subcond.test \
-subcond2.test \
-subcond3.test \
-subobj.test \
-subobj2.test \
-subobj4.test \
-subobj5.test \
-subobj6.test \
-subobj7.test \
-subobj8.test \
-subobj9.test \
-subobj10.test \
-subobj11a.test \
-subobj11b.test \
-subobj11c.test \
-subobjname.test \
-subpkg.test \
-subpkg2.test \
-subpkg3.test \
-subpkg4.test \
-subpkg-yacc.test \
-subst.test \
-subst3.test \
-subst4.test \
-subst5.test \
-subst-no-trailing-empty-line.test \
-substref.test \
-substre2.test \
-substtarg.test \
-suffix.test \
-suffix2.test \
-suffix3.tap \
-suffix4.test \
-suffix5.test \
-suffix6.test \
-suffix6b.test \
-suffix6c.test \
-suffix7.test \
-suffix8.tap \
-suffix9.test \
-suffix10.tap \
-suffix11.tap \
-suffix12.test \
-suffix13.test \
-suffix-chain.tap \
-symlink.test \
-symlink2.test \
-syntax.test \
-tap-ambiguous-directive.test \
-tap-autonumber.test \
-tap-bailout.test \
-tap-bailout-leading-space.test \
-tap-bailout-and-logging.test \
-tap-bailout-suppress-badexit.test \
-tap-bailout-suppress-later-diagnostic.test \
-tap-bailout-suppress-later-errors.test \
-tap-color.test \
-tap-deps.test \
-tap-diagnostic.test \
-tap-empty-diagnostic.test \
-tap-empty.test \
-tap-escape-directive.test \
-tap-escape-directive-2.test \
-tap-exit.test \
-tap-signal.tap \
-tap-fancy.test \
-tap-fancy2.test \
-tap-global-log.test \
-tap-global-result.test \
-tap-log.test \
-tap-msg0-result.test \
-tap-msg0-directive.test \
-tap-msg0-planskip.test \
-tap-msg0-bailout.test \
-tap-msg0-misc.test \
-tap-merge-stdout-stderr.test \
-tap-no-merge-stdout-stderr.test \
-tap-no-disable-hard-error.test \
-tap-no-spurious-summary.test \
-tap-no-spurious-numbers.test \
-tap-no-spurious.test \
-tap-not-ok-skip.test \
-tap-number-wordboundary.test \
-tap-numeric-description.test \
-tap-negative-numbers.test \
-tap-numbers-leading-zero.test \
-tap-out-of-order.test \
-tap-passthrough.test \
-tap-passthrough-exit.test \
-tap-plan.test \
-tap-plan-corner.test \
-tap-plan-errors.test \
-tap-plan-middle.test \
-tap-plan-whitespace.test \
-tap-plan-leading-zero.test \
-tap-plan-malformed.test \
-tap-missing-plan-and-bad-exit.test \
-tap-planskip.test \
-tap-planskip-late.test \
-tap-planskip-and-logging.test \
-tap-planskip-unplanned.test \
-tap-planskip-unplanned-corner.test \
-tap-planskip-case-insensitive.test \
-tap-planskip-whitespace.test \
-tap-planskip-badexit.test \
-tap-planskip-bailout.test \
-tap-planskip-later-errors.test \
-tap-realtime.test \
-tap-test-number-0.test \
-tap-recheck-logs.test \
-tap-result-comment.test \
-tap-todo-skip-together.test \
-tap-todo-skip-whitespace.test \
-tap-todo-skip.test \
-tap-unplanned.test \
-tap-whitespace-normalization.test \
-tap-with-and-without-number.test \
-tap-xfail-tests.test \
-tap-common-setup.test \
-tap-bad-prog.tap \
-tap-basic.test \
-tap-diagnostic-custom.test \
-tap-driver-stderr.test \
-tap-doc.test \
-tap-doc2.test \
-tap-more.test \
-tap-more2.test \
-tap-recheck.test \
-tap-summary.test \
-tap-summary-color.test \
-tags.test \
-tags2.test \
-tagsub.test \
-tar.test \
-tar2.test \
-tar3.test \
-tar-override.test \
-target-cflags.test \
-targetclash.test \
-tests-environment-fd-redirect.test \
-tests-environment-and-log-compiler.test \
-txinfo.test \
-txinfo2.test \
-txinfo3.test \
-txinfo4.test \
-txinfo5.test \
-txinfo5b.test \
-txinfo6.test \
-txinfo7.test \
-txinfo8.test \
-txinfo9.test \
-txinfo10.test \
-txinfo13.test \
-txinfo16.test \
-txinfo17.test \
-txinfo19.test \
-txinfo20.test \
-txinfo21.test \
-txinfo22.test \
-txinfo23.test \
-txinfo24.test \
-txinfo25.test \
-txinfo26.test \
-txinfo27.test \
-txinfo28.test \
-txinfo29.test \
-txinfo30.test \
-txinfo31.test \
-txinfo32.test \
-txinfo33.test \
-txinfo-no-clutter.test \
-txinfo-unrecognized-extension.test \
-transform.test \
-transform2.test \
-transform3.test \
-uninstall-fail.test \
-uninstall-pr9578.test \
-unused.test \
-upc.test \
-upc2.test \
-upc3.test \
-vala.test \
-vala1.test \
-vala2.test \
-vala3.test \
-vala4.test \
-vala5.test \
-vala-vpath.test \
-vala-mix.test \
-vala-mix2.test \
-vars.test \
-vars3.test \
-vartar.test \
-vartypos.test \
-vartypo2.test \
-version.test \
-version2.test \
-version3.test \
-version4.test \
-version6.test \
-version7.test \
-version8.test \
-vpath.test \
-vtexi.test \
-vtexi2.test \
-vtexi3.test \
-vtexi4.test \
-warnings-override.test \
-warnings-precedence.test \
-warnings-strictness-interactions.test \
-warnings-unknown.test \
-warnopts.test \
-warnings-win-over-strictness.test \
-warning-groups-win-over-strictness.test \
-werror.test \
-werror2.test \
-werror3.test \
-werror4.test \
-whoami.test \
-xsource.test \
-yacc.test \
-yacc2.test \
-yacc4.test \
-yacc5.test \
-yacc7.test \
-yacc8.test \
-yaccdry.test \
-yaccpp.test \
-yaccvpath.test \
-yacc-auxdir.test \
-yacc-basic.test \
-yacc-cxx.test \
-yacc-bison-skeleton-cxx.test \
-yacc-bison-skeleton.test \
-yacc-clean.test \
-yacc-clean-cxx.test \
-yacc-d-basic.test \
-yacc-d-cxx.test \
-yacc-d-vpath.test \
-yacc-deleted-headers.test \
-yacc-depend.test \
-yacc-depend2.test \
-yacc-dist-nobuild-subdir.test \
-yacc-dist-nobuild.test \
-yacc-line.test \
-yacc-mix-c-cxx.test \
-yacc-nodist.test \
-yacc-pr204.test \
-yacc-weirdnames.test \
-yflags.test \
-yflags2.test \
-yflags-cmdline-override.test \
-yflags-conditional.test \
-yflags-d-false-positives.test \
-yflags-force-conditional.test \
-yflags-force-override.test \
-yflags-var-expand.test \
-libtool-macros.test \
-gettext-macros.test
-
-print-list-of-tests:
-	@echo $(handwritten_TESTS)
-.PHONY: print-list-of-tests