From d4a102bec07f508ba1e509d6ee3ed960e377042b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 27 Aug 2011 15:01:33 +0200
Subject: [PATCH] tests: list of tests placed in a separate Makefile fragment

This change allows us to easily use make instead of by-hand (and
more fragile) grepping to extract the list of hand-written tests
from our Makefiles.

* bootstrap (BOOTSTRAP_MAKE): New variable.
Use it to run make in order to extract the list of hand-written
tests from ...
* tests/list-of-tests.mk: ... this new file, where they are
listed in ...
(handwritten_TESTS, tap_with_common_setup_TESTS, tap_other_TESTS):
... these variables, extracted respectively from ...
* tests/Makefile.am (handwritten_tests, tap_other_tests,
tap_with_common_setup_tests): ... these older variables, now
removed.
(EXTRA_DIST, expected_list_of_tests): Update w.r.t. the variable
names' changes.
(include $(srcdir)/list-of-tests.mk): New inclusion.
Remove an overkill indirection, and with it ...
(tap_with_common_setup_logs): ... this variable.
($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am):
Update to match the new interface of ...
(gen-parallel-tests, gen-config-shell-tests): ... these scripts,
that now read the list of tests from the standard input.
---
 ChangeLog                    |   26 +
 bootstrap                    |    8 +-
 tests/Makefile.am            | 1145 +---------------------------------
 tests/Makefile.in            |   63 +-
 tests/gen-config-shell-tests |    4 +-
 tests/gen-parallel-tests     |    4 +-
 tests/list-of-tests.mk       | 1136 +++++++++++++++++++++++++++++++++
 7 files changed, 1230 insertions(+), 1156 deletions(-)
 create mode 100644 tests/list-of-tests.mk

diff --git a/ChangeLog b/ChangeLog
index f6f444754..54ea99305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2011-08-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: list of tests placed in a separate Makefile fragment
+	This change allows us to easily use make instead of by-hand (and
+	more fragile) grepping to extract the list of hand-written tests
+	from our Makefiles.
+	* bootstrap (BOOTSTRAP_MAKE): New variable.
+	Use it to run make in order to extract the list of hand-written
+	tests from ...
+	* tests/list-of-tests.mk: ... this new file, where they are
+	listed in ...
+	(handwritten_TESTS, tap_with_common_setup_TESTS, tap_other_TESTS):
+	... these variables, extracted respectively from ...
+	* tests/Makefile.am (handwritten_tests, tap_other_tests,
+	tap_with_common_setup_tests): ... these older variables, now
+	removed.
+	(EXTRA_DIST, expected_list_of_tests): Update w.r.t. the variable
+	names' changes.
+	(include $(srcdir)/list-of-tests.mk): New inclusion.
+	Remove an overkill indirection, and with it ...
+	(tap_with_common_setup_logs): ... this variable.
+	($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am):
+	Update to match the new interface of ...
+	(gen-parallel-tests, gen-config-shell-tests): ... these scripts,
+	that now read the list of tests from the standard input.
+
 2011-08-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	tests: prefer AM_... variables to user-reserved ones in Makefile
diff --git a/bootstrap b/bootstrap
index d289bdf71..656fef707 100755
--- a/bootstrap
+++ b/bootstrap
@@ -32,6 +32,8 @@ export AUTOCONF  # might be used by aclocal and/or automake
 export AUTOM4TE  # ditto
 : ${PERL=perl}
 
+BOOTSTRAP_MAKE=${BOOTSTRAP_MAKE-${MAKE-make}}
+
 # Variables to substitute.
 VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
 PACKAGE=automake
@@ -105,8 +107,10 @@ dosubst automake.in automake.tmp
 
 # Create required makefile snippets.
 cd tests
-$BOOTSTRAP_SHELL ./gen-parallel-tests > parallel-tests.am
-$BOOTSTRAP_SHELL ./gen-config-shell-tests > config-shell-tests.am
+$BOOTSTRAP_MAKE -s -f list-of-tests.mk print-list-of-tests \
+  | $BOOTSTRAP_SHELL ./gen-parallel-tests > parallel-tests.am
+$BOOTSTRAP_MAKE -s -f list-of-tests.mk print-list-of-tests \
+  | $BOOTSTRAP_SHELL ./gen-config-shell-tests > config-shell-tests.am
 cd ..
 
 # Run the autotools.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ce3788443..e828c59d0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,7 +52,9 @@ txinfo5.test
 include $(srcdir)/parallel-tests.am
 
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
-	$(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
+	$(AM_V_GEN)($(am__cd) $(srcdir) \
+	  && $(MAKE) $(AM_MAKEFLAGS) -s print-list-of-test \
+	    | $(SHELL) ./gen-parallel-tests) >$@
 EXTRA_DIST += gen-parallel-tests
 
 TEST_EXTENSIONS += .ptest
@@ -69,7 +71,9 @@ $(parallel_tests):
 include $(srcdir)/config-shell-tests.am
 
 $(srcdir)/config-shell-tests.am: gen-config-shell-tests Makefile.am
-	$(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-config-shell-tests) >$@
+	$(AM_V_GEN)($(am__cd) $(srcdir) \
+	  && $(MAKE) $(AM_MAKEFLAGS) print-list-of-test \
+	    | $(SHELL) ./gen-config-shell-tests) >$@
 EXTRA_DIST += gen-config-shell-tests
 
 TEST_EXTENSIONS += .shtst
@@ -103,1038 +107,18 @@ AM_TESTS_ENVIRONMENT += AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC;
 AM_TESTS_FD_REDIRECT = 9>&2
 AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
 
+# Include definition of list of hand-written tests.  We keep that in a
+# separate file to simplify bootstrapping of Automake from a VCS checkout.
+include $(srcdir)/list-of-tests.mk
+
+EXTRA_DIST += $(handwritten_TESTS)
+
 TESTS = \
-  $(handwritten_tests) \
+  $(handwritten_TESTS) \
   $(config_shell_tests) \
   $(parallel_tests)
 
-EXTRA_DIST += $(handwritten_tests)
-
-handwritten_tests = \
-## This tests might quite a long time, since they run various checks
-## sequentially; so place them early first to improve performance on
-## concurrent testsuite runs.
-depmod.tap \
-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 \
-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-deprecation.test \
-ansi.test \
-ansi2.test \
-ansi3.test \
-ansi3b.test \
-ansi4.test \
-ansi5.test \
-ansi6.test \
-ansi7.test \
-ansi8.test \
-ansi9.test \
-ansi10.test \
-ar-lib.test \
-ar.test \
-ar2.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 \
-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.test \
-cscope2.test \
-cscope3.test \
-cxx.test \
-cxx2.test \
-cxxansi.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 \
-depacl2.test \
-depcomp.test \
-depcomp2.test \
-depcomp3.test \
-depcomp4.test \
-depcomp5.test \
-depcomp6.test \
-depcomp7.test \
-depcomp8a.test \
-depcomp8b.test \
-depdist.test \
-depend.test \
-depend2.test \
-depend3.test \
-depend4.test \
-depend5.test \
-depend6.test \
-deprecated-acinit.test \
-destdir.test \
-dirlist.test \
-dirlist2.test \
-discover.test \
-dist-included-parent-dir.test \
-distcleancheck.test \
-distcom2.test \
-distcom3.test \
-distcom4.test \
-distcom5.test \
-distcom6.test \
-distcom7.test \
-distdir.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 \
-dmalloc.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 \
-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 \
-getopt.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-maintainer.test \
-help-multilib.test \
-help-python.test \
-help-regex.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-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 \
-interp.test \
-interp2.test \
-java.test \
-java2.test \
-java3.test \
-java-check.test \
-java-empty-classpath.test \
-javaprim.test \
-javasubst.test \
-java-extra.test \
-java-noinst.test \
-ldadd.test \
-ldflags.test \
-lex.test \
-lex2.test \
-lex3.test \
-lex4.test \
-lex5.test \
-lexcpp.test \
-lexvpath.test \
-lex-subobj-nodep.test \
-lex-lib.test \
-lex-lib-external.test \
-lex-libobj.test \
-lex-noyywrap.test \
-lflags.test \
-lflags2.test \
-libexec.test \
-libobj-basic.test \
-libobj2.test \
-libobj3.test \
-libobj4.test \
-libobj5.test \
-libobj7.test \
-libobj8.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_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 \
-lzip.test \
-lzma.test \
-m4-inclusion.test \
-maintclean.test \
-maintclean-vpath.test \
-make.test \
-makej.test \
-makej2.test \
-maken.test \
-maken2.test \
-maken3.test \
-maken4.test \
-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 \
-mkinstall.test \
-mkinst2.test \
-mkinst3.test \
-mmode.test \
-mmodely.test \
-multlib.test \
-no-outdir-option.test \
-nobase.test \
-nobase-libtool.test \
-nobase-python.test \
-nodef.test \
-nodef2.test \
-nodep.test \
-nodep2.test \
-nodepcomp.test \
-nodist.test \
-nodist2.test \
-nodist3.test \
-nogzip.test \
-nogzip2.test \
-noinst.test \
-noinstdir.test \
-nolink.test \
-nostdinc.test \
-notrans.test \
-number.test \
-objc.test \
-objc2.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 \
-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-suffix.test \
-parallel-tests-suffix-prog.test \
-parallel-tests-log-compiler-1.test \
-parallel-tests-log-compiler-2.test \
-parallel-tests-dry-run.test \
-parallel-tests-fd-redirect.test \
-parallel-tests-extra-programs.test \
-parallel-tests-unreadable.test \
-parallel-tests-subdir.test \
-parallel-tests-interrupt.test \
-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 \
-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-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-custom-html.test \
-test-driver-custom-no-html.test \
-test-driver-create-log-dir.test \
-test-driver-strip-vpath.test \
-test-driver-trs-suffix-registered.test \
-test-driver-fail.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 \
-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 \
-pr204.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.test \
-primary-prefix-valid-couples.test \
-primary-prefix-couples-force-valid.test \
-primary-prefix-couples-documented-valid.test \
-proginst.test \
-programs-primary-rewritten.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 \
-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 \
-pr8365-remake-timing.test \
-regex.test \
-regex-obsolete.test \
-req.test \
-reqd.test \
-reqd2.test \
-repeated-options.test \
-rulepat.test \
-self-check-cleanup.test \
-self-check-dir.test \
-self-check-env-sanitize.tap \
-self-check-exit.tap \
-self-check-explicit-skips.test \
-self-check-is_newest.test \
-self-check-me.tap \
-self-check-reexec.test \
-self-check-report.test \
-self-check-sanity.test \
-self-check-seq.test \
-self-check-tap.test \
-self-check-unindent.test \
-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-many-gcc.test \
-silent-many-generic.test \
-silent-lex-gcc.test \
-silent-lex-generic.test \
-silent-yacc-gcc.test \
-silent-yacc-generic.test \
-silent-nowarn.test \
-silent-configsite.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 \
-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 \
-subobj3.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 \
-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_with_common_setup_tests) \
-$(tap_other_tests) \
-tags.test \
-tags2.test \
-tagsub.test \
-tar.test \
-tar2.test \
-tar3.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 \
-txinfo18.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-unrecognized-extension.test \
-transform.test \
-transform2.test \
-unused.test \
-upc.test \
-upc2.test \
-upc3.test \
-vala.test \
-vala1.test \
-vala2.test \
-vala3.test \
-vala4.test \
-vala5.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 \
-xz.test \
-yacc-basic.test \
-yacc-d-basic.test \
-yacc-clean.test \
-yacc.test \
-yacc2.test \
-yacc4.test \
-yacc5.test \
-yacc6.test \
-yacc7.test \
-yacc8.test \
-yaccdry.test \
-yacc-dist-nobuild.test \
-yacc-nodist.test \
-yaccpp.test \
-yaccvpath.test \
-yacc-d-vpath.test \
-yacc-dist-nobuild-subdir.test \
-yflags.test \
-yflags2.test \
-yflags-cmdline-override.test \
-yflags-conditional.test \
-yflags-d-false-positives.test \
-yflags-force-override.test \
-yflags-force-conditional.test \
-yflags-var-expand.test
-
-## Files containing auxiliary functions used by our test cases.
-EXTRA_DIST += tap-functions.sh plain-functions.sh
+# Extra dependencies for hand-written tests.
 
 test-driver-custom-multitest.log: trivial-test-driver
 test-driver-custom-multitest-recheck.log: trivial-test-driver
@@ -1150,103 +134,9 @@ EXTRA_DIST += extract-testsuite-summary
 testsuite-summary-count-many.log: trivial-test-driver
 testsuite-summary-count-many.log: extract-testsuite-summary
 
-# List of tests on TAP support that use the files pre-computed by
-# `tap-common-setup.test', and sources the `tap-setup.sh' helper
-# script.
-tap_with_common_setup_tests = \
-tap-ambiguous-directive.test \
-tap-autonumber.test \
-tap-bailout.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.test \
-tap-fancy.test \
-tap-fancy2.test \
-tap-global-log.test \
-tap-global-result.test \
-tap-html.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
-
-# Their log files.
-tap_with_common_setup_logs = $(tap_with_common_setup_tests:.test=.log)
-
-# Their dependencies.
-$(tap_with_common_setup_logs): tap-common-setup.log tap-setup.sh
+$(tap_with_common_setup_TESTS:.test=.log): tap-common-setup.log tap-setup.sh
 EXTRA_DIST += tap-setup.sh
 
-# Other tests on TAP support.
-tap_other_tests = \
-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
-
 tap-summary.log tap-summary-color.log: tap-summary-aux.sh
 EXTRA_DIST += tap-summary-aux.sh
 
@@ -1267,7 +157,7 @@ check-local: check-no-repeated-test-name
 
 ## Checking the list of tests.
 checked_test_extensions = .test .tap
-expected_list_of_tests = $(handwritten_tests)
+expected_list_of_tests = $(handwritten_TESTS)
 include $(top_srcdir)/CheckListOfTests.am
 
 # Dependencies valid for each test case.
@@ -1276,6 +166,9 @@ $(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION)
 # subdivision of the tests.
 $(TEST_LOGS): plain-functions.sh tap-functions.sh
 
+## Files containing auxiliary functions used by our test cases.
+EXTRA_DIST += tap-functions.sh plain-functions.sh
+
 clean-local: clean-local-check
 .PHONY: clean-local-check
 clean-local-check:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 42c6b2392..3513de280 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -52,8 +52,8 @@ host_triplet = @host@
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/aclocal.in $(srcdir)/automake.in \
 	$(srcdir)/config-shell-tests.am $(srcdir)/defs \
-	$(srcdir)/defs-static.in $(srcdir)/parallel-tests.am \
-	$(top_srcdir)/CheckListOfTests.am
+	$(srcdir)/defs-static.in $(srcdir)/list-of-tests.mk \
+	$(srcdir)/parallel-tests.am $(top_srcdir)/CheckListOfTests.am
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
@@ -302,11 +302,15 @@ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
 AM_TAP_LOG_DRIVER_FLAGS = --merge --comments --diagnostic-string \
 	`printf '\043%%\043\n'`
 MAINTAINERCLEANFILES = 
+
+# Include definition of list of hand-written tests.  We keep that in a
+# separate file to simplify bootstrapping of Automake from a VCS checkout.
 EXTRA_DIST = ChangeLog-old gen-parallel-tests parallel-tests.sh \
 	gen-config-shell-tests config-shell-tests.sh \
-	$(handwritten_tests) tap-functions.sh plain-functions.sh \
-	trivial-test-driver testsuite-summary-checks.sh \
-	extract-testsuite-summary tap-setup.sh tap-summary-aux.sh
+	$(handwritten_TESTS) trivial-test-driver \
+	testsuite-summary-checks.sh extract-testsuite-summary \
+	tap-setup.sh tap-summary-aux.sh tap-functions.sh \
+	plain-functions.sh
 XFAIL_TESTS = \
 all.test \
 cond17.test \
@@ -350,12 +354,12 @@ AM_TESTS_ENVIRONMENT = test x"$$me" = x || unset me; test \
 # We want warning messages and explanations for skipped tests to go to
 # the console if possible, so set up `stderr_fileno_' properly.
 AM_TESTS_FD_REDIRECT = 9>&2
-TESTS = \
-  $(handwritten_tests) \
-  $(config_shell_tests) \
-  $(parallel_tests)
 
-handwritten_tests = \
+# 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 improved performance on
+# concurrent testsuite runs.
+handwritten_TESTS = \
 depmod.tap \
 instspc.tap \
 aclocal.test \
@@ -1263,8 +1267,8 @@ suffix-chain.tap \
 symlink.test \
 symlink2.test \
 syntax.test \
-$(tap_with_common_setup_tests) \
-$(tap_other_tests) \
+$(tap_with_common_setup_TESTS) \
+$(tap_other_TESTS) \
 tags.test \
 tags2.test \
 tagsub.test \
@@ -1377,9 +1381,9 @@ yflags-var-expand.test
 
 
 # List of tests on TAP support that use the files pre-computed by
-# `tap-common-setup.test', and sources the `tap-setup.sh' helper
+# `tap-common-setup.test', and source the `tap-setup.sh' helper
 # script.
-tap_with_common_setup_tests = \
+tap_with_common_setup_TESTS = \
 tap-ambiguous-directive.test \
 tap-autonumber.test \
 tap-bailout.test \
@@ -1452,11 +1456,8 @@ tap-with-and-without-number.test \
 tap-xfail-tests.test
 
 
-# Their log files.
-tap_with_common_setup_logs = $(tap_with_common_setup_tests:.test=.log)
-
 # Other tests on TAP support.
-tap_other_tests = \
+tap_other_TESTS = \
 tap-common-setup.test \
 tap-bad-prog.tap \
 tap-basic.test \
@@ -1470,8 +1471,13 @@ tap-recheck.test \
 tap-summary.test \
 tap-summary-color.test
 
+TESTS = \
+  $(handwritten_TESTS) \
+  $(config_shell_tests) \
+  $(parallel_tests)
+
 checked_test_extensions = .test .tap
-expected_list_of_tests = $(handwritten_tests)
+expected_list_of_tests = $(handwritten_TESTS)
 am__tmk = tests-in-makefile-list.tmp
 am__tfs = tests-on-filesystem-list.tmp
 am__tdf = diff-in-tests-lists.tmp
@@ -1479,7 +1485,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .html .log .ptest .shtst .tap .test .trs
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/parallel-tests.am $(srcdir)/config-shell-tests.am $(top_srcdir)/CheckListOfTests.am $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/parallel-tests.am $(srcdir)/config-shell-tests.am $(srcdir)/list-of-tests.mk $(top_srcdir)/CheckListOfTests.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1903,7 +1909,9 @@ posixsubst-tests-p.log: posixsubst-tests.test
 tests-environment-p.log: tests-environment.test
 
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
-	$(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
+	$(AM_V_GEN)($(am__cd) $(srcdir) \
+	  && $(MAKE) $(AM_MAKEFLAGS) -s print-list-of-test \
+	    | $(SHELL) ./gen-parallel-tests) >$@
 
 # All `*-p.ptest' tests work by sourcing the script `parallel-tests.sh'.
 $(parallel_tests:.ptest=.log): parallel-tests.sh
@@ -1928,7 +1936,9 @@ missing5-w.log: missing5.test
 mkinst3-w.log: mkinst3.test
 
 $(srcdir)/config-shell-tests.am: gen-config-shell-tests Makefile.am
-	$(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-config-shell-tests) >$@
+	$(AM_V_GEN)($(am__cd) $(srcdir) \
+	  && $(MAKE) $(AM_MAKEFLAGS) print-list-of-test \
+	    | $(SHELL) ./gen-config-shell-tests) >$@
 
 # All `*-w.shtst' tests work by sourcing the script `config-shell-tests.sh'.
 $(config_shell_tests:.shtst=.log): config-shell-tests.sh
@@ -1936,6 +1946,12 @@ $(config_shell_tests:.shtst=.log): config-shell-tests.sh
 # expected log files from the `.shtst.log' suffix rule.
 $(config_shell_tests):
 
+print-list-of-tests:
+	@echo $(handwritten_TESTS)
+.PHONY: print-list-of-tests
+
+# Extra dependencies for hand-written tests.
+
 test-driver-custom-multitest.log: trivial-test-driver
 test-driver-custom-multitest-recheck.log: trivial-test-driver
 test-driver-custom-multitest-recheck2.log: trivial-test-driver
@@ -1947,8 +1963,7 @@ testsuite-summary-color.log testsuite-summary-count.log: \
 testsuite-summary-count-many.log: trivial-test-driver
 testsuite-summary-count-many.log: extract-testsuite-summary
 
-# Their dependencies.
-$(tap_with_common_setup_logs): tap-common-setup.log tap-setup.sh
+$(tap_with_common_setup_TESTS:.test=.log): tap-common-setup.log tap-setup.sh
 
 tap-summary.log tap-summary-color.log: tap-summary-aux.sh
 
diff --git a/tests/gen-config-shell-tests b/tests/gen-config-shell-tests
index 82477e372..4234d6c67 100755
--- a/tests/gen-config-shell-tests
+++ b/tests/gen-config-shell-tests
@@ -37,10 +37,10 @@
 
 set -e
 
-tests=`sed -n '/^handwritten_tests =/,/^$/s/\(.*\.test\).*/\1/p' Makefile.am`
+tests=`cat`
 
 if test -z "$tests"; then
-  echo "$0: failed to obtain list of tests" >&2
+  echo "$0: list of tests must be passed on stdin" >&2
   exit 1
 fi
 
diff --git a/tests/gen-parallel-tests b/tests/gen-parallel-tests
index ed975fe59..90842a875 100755
--- a/tests/gen-parallel-tests
+++ b/tests/gen-parallel-tests
@@ -30,10 +30,10 @@
 
 set -e
 
-tests=`sed -n '/^handwritten_tests =/,/^$/s/\(.*\.test\).*/\1/p' Makefile.am`
+tests=`cat`
 
 if test -z "$tests"; then
-  echo "$0: failed to obtain list of tests" >&2
+  echo "$0: list of tests must be passed on stdin" >&2
   exit 1
 fi
 
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
new file mode 100644
index 000000000..f36cf4f13
--- /dev/null
+++ b/tests/list-of-tests.mk
@@ -0,0 +1,1136 @@
+## 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 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/>.
+
+# 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 improved performance on
+# concurrent testsuite runs.
+handwritten_TESTS = \
+depmod.tap \
+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 \
+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-deprecation.test \
+ansi.test \
+ansi2.test \
+ansi3.test \
+ansi3b.test \
+ansi4.test \
+ansi5.test \
+ansi6.test \
+ansi7.test \
+ansi8.test \
+ansi9.test \
+ansi10.test \
+ar-lib.test \
+ar.test \
+ar2.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 \
+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.test \
+cscope2.test \
+cscope3.test \
+cxx.test \
+cxx2.test \
+cxxansi.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 \
+depacl2.test \
+depcomp.test \
+depcomp2.test \
+depcomp3.test \
+depcomp4.test \
+depcomp5.test \
+depcomp6.test \
+depcomp7.test \
+depcomp8a.test \
+depcomp8b.test \
+depdist.test \
+depend.test \
+depend2.test \
+depend3.test \
+depend4.test \
+depend5.test \
+depend6.test \
+deprecated-acinit.test \
+destdir.test \
+dirlist.test \
+dirlist2.test \
+discover.test \
+dist-included-parent-dir.test \
+distcleancheck.test \
+distcom2.test \
+distcom3.test \
+distcom4.test \
+distcom5.test \
+distcom6.test \
+distcom7.test \
+distdir.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 \
+dmalloc.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 \
+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 \
+getopt.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-maintainer.test \
+help-multilib.test \
+help-python.test \
+help-regex.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-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 \
+interp.test \
+interp2.test \
+java.test \
+java2.test \
+java3.test \
+java-check.test \
+java-empty-classpath.test \
+javaprim.test \
+javasubst.test \
+java-extra.test \
+java-noinst.test \
+ldadd.test \
+ldflags.test \
+lex.test \
+lex2.test \
+lex3.test \
+lex4.test \
+lex5.test \
+lexcpp.test \
+lexvpath.test \
+lex-subobj-nodep.test \
+lex-lib.test \
+lex-lib-external.test \
+lex-libobj.test \
+lex-noyywrap.test \
+lflags.test \
+lflags2.test \
+libexec.test \
+libobj-basic.test \
+libobj2.test \
+libobj3.test \
+libobj4.test \
+libobj5.test \
+libobj7.test \
+libobj8.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_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 \
+lzip.test \
+lzma.test \
+m4-inclusion.test \
+maintclean.test \
+maintclean-vpath.test \
+make.test \
+makej.test \
+makej2.test \
+maken.test \
+maken2.test \
+maken3.test \
+maken4.test \
+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 \
+mkinstall.test \
+mkinst2.test \
+mkinst3.test \
+mmode.test \
+mmodely.test \
+multlib.test \
+no-outdir-option.test \
+nobase.test \
+nobase-libtool.test \
+nobase-python.test \
+nodef.test \
+nodef2.test \
+nodep.test \
+nodep2.test \
+nodepcomp.test \
+nodist.test \
+nodist2.test \
+nodist3.test \
+nogzip.test \
+nogzip2.test \
+noinst.test \
+noinstdir.test \
+nolink.test \
+nostdinc.test \
+notrans.test \
+number.test \
+objc.test \
+objc2.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 \
+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-suffix.test \
+parallel-tests-suffix-prog.test \
+parallel-tests-log-compiler-1.test \
+parallel-tests-log-compiler-2.test \
+parallel-tests-dry-run.test \
+parallel-tests-fd-redirect.test \
+parallel-tests-extra-programs.test \
+parallel-tests-unreadable.test \
+parallel-tests-subdir.test \
+parallel-tests-interrupt.test \
+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 \
+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-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-custom-html.test \
+test-driver-custom-no-html.test \
+test-driver-create-log-dir.test \
+test-driver-strip-vpath.test \
+test-driver-trs-suffix-registered.test \
+test-driver-fail.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 \
+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 \
+pr204.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.test \
+primary-prefix-valid-couples.test \
+primary-prefix-couples-force-valid.test \
+primary-prefix-couples-documented-valid.test \
+proginst.test \
+programs-primary-rewritten.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 \
+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 \
+pr8365-remake-timing.test \
+regex.test \
+regex-obsolete.test \
+req.test \
+reqd.test \
+reqd2.test \
+repeated-options.test \
+rulepat.test \
+self-check-cleanup.test \
+self-check-dir.test \
+self-check-env-sanitize.tap \
+self-check-exit.tap \
+self-check-explicit-skips.test \
+self-check-is_newest.test \
+self-check-me.tap \
+self-check-reexec.test \
+self-check-report.test \
+self-check-sanity.test \
+self-check-seq.test \
+self-check-tap.test \
+self-check-unindent.test \
+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-many-gcc.test \
+silent-many-generic.test \
+silent-lex-gcc.test \
+silent-lex-generic.test \
+silent-yacc-gcc.test \
+silent-yacc-generic.test \
+silent-nowarn.test \
+silent-configsite.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 \
+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 \
+subobj3.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 \
+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_with_common_setup_TESTS) \
+$(tap_other_TESTS) \
+tags.test \
+tags2.test \
+tagsub.test \
+tar.test \
+tar2.test \
+tar3.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 \
+txinfo18.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-unrecognized-extension.test \
+transform.test \
+transform2.test \
+unused.test \
+upc.test \
+upc2.test \
+upc3.test \
+vala.test \
+vala1.test \
+vala2.test \
+vala3.test \
+vala4.test \
+vala5.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 \
+xz.test \
+yacc-basic.test \
+yacc-d-basic.test \
+yacc-clean.test \
+yacc.test \
+yacc2.test \
+yacc4.test \
+yacc5.test \
+yacc6.test \
+yacc7.test \
+yacc8.test \
+yaccdry.test \
+yacc-dist-nobuild.test \
+yacc-nodist.test \
+yaccpp.test \
+yaccvpath.test \
+yacc-d-vpath.test \
+yacc-dist-nobuild-subdir.test \
+yflags.test \
+yflags2.test \
+yflags-cmdline-override.test \
+yflags-conditional.test \
+yflags-d-false-positives.test \
+yflags-force-override.test \
+yflags-force-conditional.test \
+yflags-var-expand.test
+
+# List of tests on TAP support that use the files pre-computed by
+# `tap-common-setup.test', and source the `tap-setup.sh' helper
+# script.
+tap_with_common_setup_TESTS = \
+tap-ambiguous-directive.test \
+tap-autonumber.test \
+tap-bailout.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.test \
+tap-fancy.test \
+tap-fancy2.test \
+tap-global-log.test \
+tap-global-result.test \
+tap-html.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
+
+# Other tests on TAP support.
+tap_other_TESTS = \
+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
+
+print-list-of-tests:
+	@echo $(handwritten_TESTS)
+.PHONY: print-list-of-tests
-- 
2.47.2