[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1335-gefdc3e1 |
|
Date: |
Sat, 10 Sep 2011 22:34:11 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=efdc3e177d74e62f18dbe6a8c0d3577288e64578
The branch, testsuite-work has been updated
via efdc3e177d74e62f18dbe6a8c0d3577288e64578 (commit)
via 2c48a50792d15aec423169163ebd5a99735dbc8c (commit)
via b59f2d50f0a61a434e1f17baac336d1f9ead0715 (commit)
via e00d6c989d9063d3a86b91c7439ef2bf345d603d (commit)
via 155f00aa8af0200ee091057f222ad1fc2f6a3395 (commit)
via f5f5c23d777f54e5a3cca2ab8be7587ff2750155 (commit)
from 861fcc3ef441700d83f1cbd814d69e2f21dace7f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit efdc3e177d74e62f18dbe6a8c0d3577288e64578
Author: Stefano Lattarini <address@hidden>
Date: Sun Sep 11 00:23:06 2011 +0200
tests: minor optimizations/simplifications in some aclocal tests
* acloca11.test: Instead of running ./configure and then grepping
the file it has produced, directly grep configure. Add trailing
`:' command.
* acloca12.test: Likewise.
* acloca10.test: Likewise. Also, remove the autom4te caches
by hand, instead of sleeping to ensure they get outdated and
ignored.
* aclocal9.test: Likewise.
* acloca18.test: Likewise. Also, do not remove file `foo',
which is not being created anymore.
* acloca20.test: The test makes sense only if the system support
real symlinks, so skip it if this is not the case. This allows
for various simplifications.
commit 2c48a50792d15aec423169163ebd5a99735dbc8c
Merge: b59f2d5 155f00a
Author: Stefano Lattarini <address@hidden>
Date: Sat Sep 10 23:28:59 2011 +0200
Merge branch 'prove' into testsuite-work
* prove:
prove: avoid weird signal-related bug
tests: allow use of `prove' to run automake testsuite
commit b59f2d50f0a61a434e1f17baac336d1f9ead0715
Merge: 861fcc3 e00d6c9
Author: Stefano Lattarini <address@hidden>
Date: Sat Sep 10 23:28:47 2011 +0200
Merge branch 'testsuite-more-namespace-safeness' into testsuite-work
* testsuite-more-namespace-safeness:
tests defs: more namespace-safeness
commit e00d6c989d9063d3a86b91c7439ef2bf345d603d
Author: Stefano Lattarini <address@hidden>
Date: Sat Sep 10 21:59:09 2011 +0200
tests defs: more namespace-safeness
($using_tap): Renamed ...
($am_using_tap): ... to this.
($parallel_tests): Renamed ...
($am_parallel_tests): ... to this.
($test_prefer_config_shell): Renamed ...
($am_test_prefer_config_shell): ... to this.
($original_AUTOMAKE): Renamed ...
($am_original_AUTOMAKE): ... to this.
($original_ACLOCAL): Renamed ...
($am_original_ACLOCAL): ... to this.
* tests/defs, tests/defs-static.in, tests/gen-testsuite-part,
tests/README, and all callers: Adjusted.
* tests/Makefile.am (AM_TESTS_ENVIRONMENT): Adjust, and rewrite
to make future adjustments easier.
* tests/defs (funcs_file_): Renamed ...
(am_funcs_file): ... to this.
* Makefile.am (sc_tests_obsolete_variables): New maintainer
check.
(syntax_check_rules): Add it.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 64 ++++++++
Makefile.am | 29 ++++
Makefile.in | 28 ++++
tests/Makefile.am | 101 ++++++++++++-
tests/Makefile.in | 170 ++++++++++++++++++++--
tests/README | 4 +-
tests/acloca10.test | 46 +++---
tests/acloca11.test | 13 +-
tests/acloca12.test | 15 +-
tests/acloca18.test | 63 ++++-----
tests/acloca20.test | 41 ++----
tests/aclocal9.test | 20 ++--
tests/am-tests-environment.test | 2 +-
tests/amopts-variable-expansion.test | 2 +-
tests/backcompat5.test | 2 +-
tests/check-concurrency-bug9245.test | 2 +-
tests/check-exported-srcdir.test | 2 +-
tests/check-fd-redirect.test | 2 +-
tests/check-no-test-driver.test | 2 +-
tests/check-subst.test | 6 +-
tests/check-tests-in-builddir.test | 4 +-
tests/check.test | 2 +-
tests/check10.test | 2 +-
tests/check11.test | 4 +-
tests/check12.test | 6 +-
tests/check2.test | 2 +-
tests/color.test | 2 +-
tests/color2.test | 2 +-
tests/cygnus-imply-foreign.test | 2 +-
tests/defs | 50 ++++---
tests/defs-static.in | 32 ++--
tests/dejagnu.test | 2 +-
tests/gen-testsuite-part | 27 ++--
tests/gnuwarn.test | 2 +-
tests/help.test | 4 +-
tests/help2.test | 4 +-
tests/help3.test | 4 +-
tests/help4.test | 4 +-
tests/parallel-tests-cmdline-override.test | 2 +-
tests/parallel-tests-console-output.test | 2 +-
tests/parallel-tests-driver-install.test | 2 +-
tests/parallel-tests-dry-run.test | 2 +-
tests/parallel-tests-empty-testlogs.test | 2 +-
tests/parallel-tests-exit-statuses.test | 2 +-
tests/parallel-tests-extra-programs.test | 2 +-
tests/parallel-tests-fd-redirect.test | 2 +-
tests/parallel-tests-fork-bomb.test | 2 +-
tests/parallel-tests-harderror.test | 2 +-
tests/parallel-tests-interrupt.tap | 2 +-
tests/parallel-tests-log-compiler-1.test | 2 +-
tests/parallel-tests-log-compiler-2.test | 2 +-
tests/parallel-tests-log-compiler-example.test | 2 +-
tests/parallel-tests-log-override-1.test | 2 +-
tests/parallel-tests-log-override-2.test | 2 +-
tests/parallel-tests-log-override-recheck.test | 2 +-
tests/parallel-tests-no-color-in-log.test | 2 +-
tests/parallel-tests-no-spurious-summary.test | 2 +-
tests/parallel-tests-once.test | 2 +-
tests/parallel-tests-reset-term.test | 2 +-
tests/parallel-tests-subdir.test | 2 +-
tests/parallel-tests-suffix-prog.test | 2 +-
tests/parallel-tests-suffix.test | 2 +-
tests/parallel-tests-unreadable.test | 2 +-
tests/parallel-tests.test | 2 +-
tests/parallel-tests10.test | 2 +-
tests/parallel-tests2.test | 2 +-
tests/parallel-tests3.test | 2 +-
tests/parallel-tests5.test | 2 +-
tests/parallel-tests6.test | 2 +-
tests/parallel-tests8.test | 2 +-
tests/parallel-tests9.test | 2 +-
tests/pr401.test | 2 +-
tests/pr401b.test | 2 +-
tests/pr401c.test | 2 +-
tests/prove-runner | 50 +++++++
tests/self-check-env-sanitize.tap | 10 +-
tests/self-check-tap.test | 27 +++-
tests/strictness-override.test | 2 +-
tests/strictness-precedence.test | 2 +-
tests/tap-ambiguous-directive.test | 2 +-
tests/tap-autonumber.test | 2 +-
tests/tap-bad-prog.tap | 2 +-
tests/tap-bailout-and-logging.test | 2 +-
tests/tap-bailout-suppress-badexit.test | 2 +-
tests/tap-bailout-suppress-later-diagnostic.test | 2 +-
tests/tap-bailout-suppress-later-errors.test | 2 +-
tests/tap-bailout.test | 2 +-
tests/tap-basic.test | 2 +-
tests/tap-color.test | 2 +-
tests/tap-common-setup.test | 2 +-
tests/tap-deps.test | 2 +-
tests/tap-diagnostic-custom.test | 2 +-
tests/tap-diagnostic.test | 2 +-
tests/tap-doc.test | 2 +-
tests/tap-doc2.test | 2 +-
tests/tap-driver-stderr.test | 2 +-
tests/tap-empty-diagnostic.test | 2 +-
tests/tap-empty.test | 2 +-
tests/tap-escape-directive-2.test | 2 +-
tests/tap-escape-directive.test | 2 +-
tests/tap-exit.test | 2 +-
tests/tap-fancy.test | 2 +-
tests/tap-fancy2.test | 2 +-
tests/tap-global-log.test | 2 +-
tests/tap-global-result.test | 2 +-
tests/tap-html.test | 2 +-
tests/tap-log.test | 2 +-
tests/tap-merge-stdout-stderr.test | 2 +-
tests/tap-missing-plan-and-bad-exit.test | 2 +-
tests/tap-more.test | 2 +-
tests/tap-more2.test | 2 +-
tests/tap-msg0-bailout.test | 2 +-
tests/tap-msg0-directive.test | 2 +-
tests/tap-msg0-misc.test | 2 +-
tests/tap-msg0-planskip.test | 2 +-
tests/tap-msg0-result.test | 2 +-
tests/tap-negative-numbers.test | 2 +-
tests/tap-no-disable-hard-error.test | 2 +-
tests/tap-no-merge-stdout-stderr.test | 2 +-
tests/tap-no-spurious-numbers.test | 2 +-
tests/tap-no-spurious-summary.test | 2 +-
tests/tap-no-spurious.test | 2 +-
tests/tap-not-ok-skip.test | 2 +-
tests/tap-number-wordboundary.test | 2 +-
tests/tap-numbers-leading-zero.test | 2 +-
tests/tap-numeric-description.test | 2 +-
tests/tap-out-of-order.test | 2 +-
tests/tap-passthrough-exit.test | 2 +-
tests/tap-passthrough.test | 2 +-
tests/tap-plan-corner.test | 2 +-
tests/tap-plan-errors.test | 2 +-
tests/tap-plan-leading-zero.test | 2 +-
tests/tap-plan-malformed.test | 2 +-
tests/tap-plan-middle.test | 2 +-
tests/tap-plan-whitespace.test | 2 +-
tests/tap-plan.test | 2 +-
tests/tap-planskip-and-logging.test | 2 +-
tests/tap-planskip-badexit.test | 2 +-
tests/tap-planskip-bailout.test | 2 +-
tests/tap-planskip-case-insensitive.test | 2 +-
tests/tap-planskip-late.test | 2 +-
tests/tap-planskip-later-errors.test | 2 +-
tests/tap-planskip-unplanned-corner.test | 2 +-
tests/tap-planskip-unplanned.test | 2 +-
tests/tap-planskip-whitespace.test | 2 +-
tests/tap-planskip.test | 2 +-
tests/tap-realtime.test | 2 +-
tests/tap-recheck-logs.test | 2 +-
tests/tap-recheck.test | 2 +-
tests/tap-result-comment.test | 2 +-
tests/tap-signal.tap | 2 +-
tests/tap-summary-aux.sh | 2 +-
tests/tap-test-number-0.test | 2 +-
tests/tap-todo-skip-together.test | 2 +-
tests/tap-todo-skip-whitespace.test | 2 +-
tests/tap-todo-skip.test | 2 +-
tests/tap-unplanned.test | 2 +-
tests/tap-whitespace-normalization.test | 2 +-
tests/tap-with-and-without-number.test | 2 +-
tests/tap-xfail-tests.test | 2 +-
tests/test-driver-create-log-dir.test | 2 +-
tests/test-driver-custom-html.test | 2 +-
tests/test-driver-custom-multitest-recheck.test | 2 +-
tests/test-driver-custom-multitest-recheck2.test | 2 +-
tests/test-driver-custom-multitest.test | 2 +-
tests/test-driver-custom-no-extra-driver.test | 2 +-
tests/test-driver-custom-no-html.test | 2 +-
tests/test-driver-custom-xfail-tests.test | 2 +-
tests/test-driver-custom.test | 2 +-
tests/test-driver-fail.test | 2 +-
tests/test-driver-strip-vpath.test | 2 +-
tests/test-driver-trs-suffix-registered.test | 2 +-
tests/test-harness-vpath-rewrite.test | 2 +-
tests/test-log.test | 2 +-
tests/test-logs-repeated.test | 2 +-
tests/test-metadata-global-log.test | 2 +-
tests/test-metadata-global-result.test | 2 +-
tests/test-metadata-recheck.test | 2 +-
tests/test-metadata-results.test | 2 +-
tests/test-missing.test | 2 +-
tests/test-missing2.test | 2 +-
tests/test-trs-basic.test | 2 +-
tests/test-trs-recover.test | 2 +-
tests/test-trs-recover2.test | 2 +-
tests/tests-environment-and-log-compiler.test | 2 +-
tests/tests-environment-backcompat.test | 2 +-
tests/tests-environment-fd-redirect.test | 2 +-
tests/testsuite-summary-checks.sh | 2 +-
tests/testsuite-summary-count-many.test | 2 +-
tests/testsuite-summary-reference-log.test | 2 +-
tests/warning-groups-win-over-strictness.test | 2 +-
tests/warnings-override.test | 2 +-
tests/warnings-precedence.test | 2 +-
tests/warnings-strictness-interactions.test | 2 +-
tests/warnings-unknown.test | 2 +-
tests/warnings-win-over-strictness.test | 2 +-
196 files changed, 784 insertions(+), 382 deletions(-)
create mode 100755 tests/prove-runner
mode change 100644 => 100755 tests/test-logs-repeated.test
diff --git a/ChangeLog b/ChangeLog
index ae2eb2b..e1e3d89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+2011-09-10 Stefano Lattarini <address@hidden>
+
+ tests: minor optimizations/simplifications in some aclocal tests
+ * acloca11.test: Instead of running ./configure and then grepping
+ the file it has produced, directly grep configure. Add trailing
+ `:' command.
+ * acloca12.test: Likewise.
+ * acloca10.test: Likewise. Also, remove the autom4te caches
+ by hand, instead of sleeping to ensure they get outdated and
+ ignored.
+ * aclocal9.test: Likewise.
+ * acloca18.test: Likewise. Also, do not remove file `foo',
+ which is not being created anymore.
+ * acloca20.test: The test makes sense only if the system support
+ real symlinks, so skip it if this is not the case. This allows
+ for various simplifications.
+
+2011-09-10 Stefano Lattarini <address@hidden>
+
+ prove: avoid weird signal-related bug
+ * tests/defs (trap): In the trap code dealing with SIGPIPE
+ signal, ignore further signals of the same kind.
+ See also Test::Harness issue [rt.cpan.org #70855], archived at
+ <https://rt.cpan.org/Ticket/Display.html?id=70855>
+
+2011-09-10 Stefano Lattarini <address@hidden>
+
+ tests: allow use of `prove' to run automake testsuite
+ * tests/prove-runner: New helper script; mostly it wraps
+ our `*.test' test scripts to make them runnable by the
+ `prove' utility.
+ * tests/Makefile.am (EXTRA_DIST): Distribute it.
+ (PROVE, AM_PROVEFLAGS, AM_PROVECMD): New variables.
+ (prove, installprove): New targets, used run the automake
+ testsuite through the `prove' utility.
+ * tests/gen-testsuite-part: For any considered dependency,
+ generate a variables that groups all the tests depending on
+ it. This is especially useful for use in the new `prove'
+ and `installprove' targets, which cannot rely on make for
+ inter-test dependencies, and have to handle them "by hand".
+
+2011-09-10 Stefano Lattarini <address@hidden>
+
+ tests defs: more namespace-safeness
+ ($using_tap): Renamed ...
+ ($am_using_tap): ... to this.
+ ($parallel_tests): Renamed ...
+ ($am_parallel_tests): ... to this.
+ ($test_prefer_config_shell): Renamed ...
+ ($am_test_prefer_config_shell): ... to this.
+ ($original_AUTOMAKE): Renamed ...
+ ($am_original_AUTOMAKE): ... to this.
+ ($original_ACLOCAL): Renamed ...
+ ($am_original_ACLOCAL): ... to this.
+ * tests/defs, tests/defs-static.in, tests/gen-testsuite-part,
+ tests/README, and all callers: Adjusted.
+ * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Adjust, and rewrite
+ to make future adjustments easier.
+ * tests/defs (funcs_file_): Renamed ...
+ (am_funcs_file): ... to this.
+ * Makefile.am (sc_tests_obsolete_variables): New maintainer
+ check.
+ (syntax_check_rules): Add it.
+
2011-09-09 Stefano Lattarini <address@hidden>
aclocal: better URL reference in error message
diff --git a/Makefile.am b/Makefile.am
index 6c8eff4..cb6ecf5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,6 +189,7 @@ sc_perl_local_no_parens \
sc_perl_local \
sc_AMDEP_TRUE_in_automake_in \
sc_tests_make_without_am_makeflags \
+sc_tests_obsolete_variables \
sc_tests_plain_make \
sc_tests_plain_autoconf \
sc_tests_plain_autoupdate \
@@ -437,6 +438,34 @@ sc_tests_make_without_am_makeflags:
exit 1; \
fi
+## Look out for some obsolete variables.
+sc_tests_obsolete_variables:
+ @vars=" \
+ using_tap \
+ parallel_tests \
+ test_prefer_config_shell \
+ original_AUTOMAKE \
+ original_ACLOCAL \
+ "; \
+ seen=""; \
+ for v in $$vars; do \
+ if grep -E "\b$$v\b" \
+ $(srcdir)/tests/*.test \
+ $(srcdir)/tests/*.tap \
+ $(srcdir)/tests/*.sh \
+ $(srcdir)/tests/defs \
+ $(srcdir)/tests/defs-static.in \
+ ; then \
+ seen="$$seen $$v"; \
+ fi; \
+ done; \
+ if test -n "$$seen"; then \
+ for v in $$seen; do \
+ echo "Variable '$$v' is obsolete, use 'am_$$v' instead." 1>&2; \
+ done; \
+ exit 1; \
+ else :; fi
+
## Tests should never call make directly.
sc_tests_plain_make:
@if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[ ]*make( |$$)';
then \
diff --git a/Makefile.in b/Makefile.in
index 07f9808..a1a321a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -318,6 +318,7 @@ sc_perl_local_no_parens \
sc_perl_local \
sc_AMDEP_TRUE_in_automake_in \
sc_tests_make_without_am_makeflags \
+sc_tests_obsolete_variables \
sc_tests_plain_make \
sc_tests_plain_autoconf \
sc_tests_plain_autoupdate \
@@ -1193,6 +1194,33 @@ sc_tests_make_without_am_makeflags:
exit 1; \
fi
+sc_tests_obsolete_variables:
+ @vars=" \
+ using_tap \
+ parallel_tests \
+ test_prefer_config_shell \
+ original_AUTOMAKE \
+ original_ACLOCAL \
+ "; \
+ seen=""; \
+ for v in $$vars; do \
+ if grep -E "\b$$v\b" \
+ $(srcdir)/tests/*.test \
+ $(srcdir)/tests/*.tap \
+ $(srcdir)/tests/*.sh \
+ $(srcdir)/tests/defs \
+ $(srcdir)/tests/defs-static.in \
+ ; then \
+ seen="$$seen $$v"; \
+ fi; \
+ done; \
+ if test -n "$$seen"; then \
+ for v in $$seen; do \
+ echo "Variable '$$v' is obsolete, use 'am_$$v' instead." 1>&2; \
+ done; \
+ exit 1; \
+ else :; fi
+
sc_tests_plain_make:
@if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[ ]*make( |$$)';
then \
echo 'Do not run "make" in the above tests. Use "$$MAKE" instead.'
1>&2; \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 51edc2f..f502f8d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,13 +53,17 @@ txinfo5.test
# Some testsuite-influential variables should be overridable from the
# test scripts, but not from the environment.
AM_TESTS_ENVIRONMENT = \
- test x"$$me" = x || unset me; \
- test x"$$required" = x || unset required; \
- test x"$$using_tap" = x || unset using_tap; \
- test x"$$parallel_tests" = x || unset parallel_tests; \
- test x"$$test_prefer_config_shell" || unset test_prefer_config_shell; \
- test x"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \
- test x"$$original_ACLOCAL" = x || unset original_ACLOCAL;
+ for v in \
+ me \
+ required \
+ am_using_tap \
+ am_parallel_tests \
+ am_test_prefer_config_shell \
+ am_original_AUTOMAKE \
+ am_original_ACLOCAL \
+ ; do \
+ eval test x"\$${$$v}" = x || unset $$v; \
+ done;
# The `AM_TESTS_REEXEC=no' setting tells the tests not to needlessly
# re-execute themselves with the shell detected at configure time, since
# we are already running them under it explicitly in our setup (see e.g.
@@ -183,3 +187,86 @@ clean-local-check:
find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
rm -rf "$$@"; \
fi;
+
+## Run the testsuite through the `prove' utility. Mostly for maintainers,
+## and to find out possible incompatibilities between `prove' and the
+## Automake own TAP driver.
+
+PROVE = prove
+AM_PROVEFLAGS = --timer
+AM_PROVECMD = \
+ test -z "$$tests" || \
+ { \
+ $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
+ $(PROVE) $(AM_PROVEFLAGS) -e $(srcdir)/prove-runner $(PROVEFLAGS) \
+ $$tests $(AM_TESTS_FD_REDIRECT); \
+ }
+
+EXTRA_DIST += prove-runner
+
+.PHONY: prove installprove
+prove installprove: $(TESTS) prove-runner defs-static
+ @exit_status=0; \
+## The testsuite can be run either using the automake build tree or
+## the already-installed automake package.
+ case '$@' in \
+ install*) am_running_installcheck=yes;; \
+ *) am_running_installcheck=no;; \
+ esac; \
+ export am_running_installcheck; \
+## XXX Our poor-man way to handle inter-tests dependencies without the
+## XXX help of make. This is obviously fragile and doesn't scale,
+## XXX but for now it's good enough since we have only one possible
+## XXX inter-tests dependency at the moment.
+ need_tap_common_setup=no; \
+ lst=' $(TESTS) '; for t in $$lst; do \
+ case ' $(on_tap_with_common_setup_TESTS) ' in \
+ *" $$t "*) need_tap_common_setup=yes; break;; \
+ esac; \
+ done; \
+## For VPATH builds.
+ if test $$need_tap_common_setup = yes; then \
+ t=tap-common-setup.test; \
+ if test -f ./$$t; then \
+ tests=./$$t; \
+ else \
+ tests=$(srcdir)/$$t; \
+ fi; \
+## Do not stop if there's a failure here, we want to run the following
+## tests anyway.
+ echo "$@: running pre-requisite tests ..."; \
+ $(AM_PROVECMD) || exits_status=$$?; \
+ echo "$@: done. We'll shortly run the main testsuite."; \
+ fi; \
+## Handle VPATH builds, and ensure that the tests have a properly
+## qualified path.
+ tests=`\
+ for t in $(TESTS); do \
+## XXX In next line, another hack for inter-tests dependencies: this
+## XXX can't run concurrently to the tests that use the data files it
+## XXX generates.
+ case "$$need_tap_common_setup,/$$t" in \
+ yes,*/tap-common-setup.test) continue;; \
+ esac; \
+ if test -f ./$$t; then \
+ echo ./$$t; \
+ else \
+ echo $(srcdir)/$$t; \
+ fi; \
+ done`; \
+## Extra environment, mostly for use by `prove-runner'.
+## XFAIL_TESTS gets normalized to play nicer with VPATH builds.
+ XFAIL_TESTS=`\
+ for t in $(XFAIL_TESTS); do \
+ echo $$t; echo ./$$t; echo $(srcdir)/$$t; \
+ done | LC_ALL=C sort | uniq`; \
+ XFAIL_TESTS=`echo $$XFAIL_TESTS`; \
+ TAP_RUNNER='$(TAP_LOG_COMPILE)' \
+ TEST_RUNER='$(TEST_LOG_COMPILE)' \
+ export XFAIL_TESTS TAP_RUNNER TEST_RUNNER; \
+## For consistency with the Automake testsuite harness, that exports
+## this unconditionally in the test scripts' environment.
+ srcdir='$(srcdir)'; export srcdir; \
+## Here we go.
+ $(AM_PROVECMD) || exit_status=$$?; \
+ exit $$exit_status;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5ae15b1..e9fa68d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -295,11 +295,12 @@ TAP_LOG_COMPILER = $(LOG_COMPILER)
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'`
-EXTRA_DIST = ChangeLog-old $(handwritten_TESTS) tap-summary-aux.sh \
- tap-setup.sh extract-testsuite-summary \
+EXTRA_DIST = ChangeLog-old $(handwritten_TESTS) tap-setup.sh \
+ tap-summary-aux.sh extract-testsuite-summary \
testsuite-summary-checks.sh trivial-test-driver \
$(generated_TESTS) gen-testsuite-part tap-functions.sh \
- plain-functions.sh distcheck-hook-m4.am defs-static.in
+ plain-functions.sh distcheck-hook-m4.am defs-static.in \
+ prove-runner
# Hand-written tests.
@@ -323,13 +324,10 @@ txinfo5.test
# re-execute themselves with the shell detected at configure time, since
# we are already running them under it explicitly in our setup (see e.g.
# the definition of TEST_LOG_COMPILER above).
-AM_TESTS_ENVIRONMENT = test x"$$me" = x || unset me; test \
- x"$$required" = x || unset required; test x"$$using_tap" = x \
- || unset using_tap; test x"$$parallel_tests" = x || unset \
- parallel_tests; test x"$$test_prefer_config_shell" || unset \
- test_prefer_config_shell; test x"$$original_AUTOMAKE" = x || \
- unset original_AUTOMAKE; test x"$$original_ACLOCAL" = x || \
- unset original_ACLOCAL; AM_TESTS_REEXEC=no; export \
+AM_TESTS_ENVIRONMENT = for v in me required am_using_tap \
+ am_parallel_tests am_test_prefer_config_shell \
+ am_original_AUTOMAKE am_original_ACLOCAL ; do eval test \
+ x"\$${$$v}" = x || unset $$v; done; AM_TESTS_REEXEC=no; export \
AM_TESTS_REEXEC; stderr_fileno_=9; export stderr_fileno_;
# We want warning messages and explanations for skipped tests to go to
# the console if possible, so set up `stderr_fileno_' properly.
@@ -1435,6 +1433,96 @@ yflags-force-override.test \
yflags-force-conditional.test \
yflags-var-expand.test
+on_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.tap \
+ 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
+
+check_tap_testsuite_summary_TESTS = \
+ tap-summary.test \
+ tap-summary-color.test
+
+extract_testsuite_summary_TESTS = \
+ testsuite-summary-count-many.test
+
+check_testsuite_summary_TESTS = \
+ testsuite-summary-color.test \
+ testsuite-summary-count.test
+
+use_trivial_test_driver_TESTS = \
+ testsuite-summary-count-many.test \
+ test-driver-custom-multitest.test \
+ test-driver-custom-multitest-recheck.test \
+ test-driver-custom-multitest-recheck2.test \
+ test-driver-custom-html.test
+
generated_TESTS = ar-lib-w.test compile-w.test compile2-w.test \
compile3-w.test compile4-w.test compile5-w.test \
compile6-w.test instsh2-w.test instsh3-w.test mdate5-w.test \
@@ -1527,6 +1615,16 @@ CLEANFILES = defs-static
am__tmk = tests-in-makefile-list.tmp
am__tfs = tests-on-filesystem-list.tmp
am__tdf = diff-in-tests-lists.tmp
+PROVE = prove
+AM_PROVEFLAGS = --timer
+AM_PROVECMD = \
+ test -z "$$tests" || \
+ { \
+ $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
+ $(PROVE) $(AM_PROVEFLAGS) -e $(srcdir)/prove-runner $(PROVEFLAGS) \
+ $$tests $(AM_TESTS_FD_REDIRECT); \
+ }
+
all: all-am
.SUFFIXES:
@@ -1920,8 +2018,6 @@ uninstall-am:
print-list-of-tests:
@echo $(handwritten_TESTS)
.PHONY: print-list-of-tests
-tap-summary.log: tap-summary-aux.sh
-tap-summary-color.log: tap-summary-aux.sh
tap-ambiguous-directive.log: tap-setup.sh tap-common-setup.log
tap-autonumber.log: tap-setup.sh tap-common-setup.log
tap-bailout.log: tap-setup.sh tap-common-setup.log
@@ -1992,6 +2088,8 @@ tap-unplanned.log: tap-setup.sh tap-common-setup.log
tap-whitespace-normalization.log: tap-setup.sh tap-common-setup.log
tap-with-and-without-number.log: tap-setup.sh tap-common-setup.log
tap-xfail-tests.log: tap-setup.sh tap-common-setup.log
+tap-summary.log: tap-summary-aux.sh
+tap-summary-color.log: tap-summary-aux.sh
testsuite-summary-count-many.log: extract-testsuite-summary
testsuite-summary-color.log: testsuite-summary-checks.sh
testsuite-summary-count.log: testsuite-summary-checks.sh
@@ -2341,6 +2439,54 @@ clean-local-check:
rm -rf "$$@"; \
fi;
+.PHONY: prove installprove
+prove installprove: $(TESTS) prove-runner defs-static
+ @exit_status=0; \
+ case '$@' in \
+ install*) am_running_installcheck=yes;; \
+ *) am_running_installcheck=no;; \
+ esac; \
+ export am_running_installcheck; \
+ need_tap_common_setup=no; \
+ lst=' $(TESTS) '; for t in $$lst; do \
+ case ' $(on_tap_with_common_setup_TESTS) ' in \
+ *" $$t "*) need_tap_common_setup=yes; break;; \
+ esac; \
+ done; \
+ if test $$need_tap_common_setup = yes; then \
+ t=tap-common-setup.test; \
+ if test -f ./$$t; then \
+ tests=./$$t; \
+ else \
+ tests=$(srcdir)/$$t; \
+ fi; \
+ echo "$@: running pre-requisite tests ..."; \
+ $(AM_PROVECMD) || exits_status=$$?; \
+ echo "$@: done. We'll shortly run the main testsuite."; \
+ fi; \
+ tests=`\
+ for t in $(TESTS); do \
+ case "$$need_tap_common_setup,/$$t" in \
+ yes,*/tap-common-setup.test) continue;; \
+ esac; \
+ if test -f ./$$t; then \
+ echo ./$$t; \
+ else \
+ echo $(srcdir)/$$t; \
+ fi; \
+ done`; \
+ XFAIL_TESTS=`\
+ for t in $(XFAIL_TESTS); do \
+ echo $$t; echo ./$$t; echo $(srcdir)/$$t; \
+ done | LC_ALL=C sort | uniq`; \
+ XFAIL_TESTS=`echo $$XFAIL_TESTS`; \
+ TAP_RUNNER='$(TAP_LOG_COMPILE)' \
+ TEST_RUNER='$(TEST_LOG_COMPILE)' \
+ export XFAIL_TESTS TAP_RUNNER TEST_RUNNER; \
+ srcdir='$(srcdir)'; export srcdir; \
+ $(AM_PROVECMD) || exit_status=$$?; \
+ exit $$exit_status;
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tests/README b/tests/README
index b6dd45c..980299d 100644
--- a/tests/README
+++ b/tests/README
@@ -184,9 +184,9 @@ Do
instead.
For tests that use the `parallel-tests' Automake option, set the shell
- variable `parallel_tests' to "yes" before including ./defs. For tests
+ variable `am_parallel_tests' to "yes" before including ./defs. For tests
that are *not* meant to work with the `parallel-tests' Automake option
- (these should be very very few), set the shell variable `parallel_tests'
+ (these should be very very few), set the shell variable `am_parallel_tests'
to "no" before including ./defs.
Some tests in the Automake testsuite are auto-generated; those tests
diff --git a/tests/acloca10.test b/tests/acloca10.test
index 0041d57..1121703 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -28,8 +28,8 @@ am_create_testdir=empty
cat > configure.in << 'END'
AC_INIT
-MACRO2
MACRO1
+MACRO2
MACRO3
END
@@ -39,61 +39,59 @@ mkdir m4_1 m4_2 acdir acdir2
echo ./acdir2 > acdir/dirlist
cat >m4_1/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 >> foo])
-AC_DEFUN([MACRO2], [echo macro21 > foo])
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
EOF
cat >m4_2/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 >> foo])
+AC_DEFUN([MACRO1], [:macro12:])
EOF
cat >acdir2/macro.m4 <<EOF
-AC_DEFUN([MACRO3], [echo macro3 >> foo])
+AC_DEFUN([MACRO3], [:macro33:])
EOF
$ACLOCAL -I m4_1 -I m4_2
$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-grep macro3 foo
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
grep MACRO3 aclocal.m4
test ! -f m4_1/macro.m4
test ! -f m4_2/macro.m4
-$sleep
+rm -rf autom4te*.cache
$ACLOCAL -I m4_2 -I m4_1
$AUTOCONF
-./configure
-grep macro12 foo
-grep macro21 foo
-grep macro3 foo
+$FGREP ':macro12:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
grep MACRO3 aclocal.m4
test ! -f m4_1/macro.m4
test ! -f m4_2/macro.m4
-$sleep
+rm -rf autom4te*.cache
$ACLOCAL -I m4_1 -I m4_2 --install
$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-grep macro3 foo
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
grep MACRO3 aclocal.m4 && Exit 1
test -f m4_1/macro.m4
test ! -f m4_2/macro.m4
cp aclocal.m4 copy.m4
-$sleep
+rm -rf autom4te*.cache
echo '#GREPME' >>acdir2/macro.m4
$ACLOCAL -I m4_1 -I m4_2 --install
$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-grep macro3 foo
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
grep MACRO3 aclocal.m4 && Exit 1
grep GREPME m4_1/macro.m4 && Exit 1
test -f m4_1/macro.m4
test ! -f m4_2/macro.m4
diff aclocal.m4 copy.m4
+
+:
diff --git a/tests/acloca11.test b/tests/acloca11.test
index ddb9156..7ce0a4d 100755
--- a/tests/acloca11.test
+++ b/tests/acloca11.test
@@ -29,16 +29,17 @@ END
mkdir m4
cat >m4/version1.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 >> foo])
-AC_DEFUN([MACRO2], [echo macro21 > foo])
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
EOF
cat >m4/version2.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 >> foo])
+AC_DEFUN([MACRO1], [:macro12:])
EOF
$ACLOCAL -I m4
$AUTOCONF
-./configure
-grep macro12 foo
-grep macro21 foo
+$FGREP ':macro12:' configure
+$FGREP ':macro21:' configure
+
+:
diff --git a/tests/acloca12.test b/tests/acloca12.test
index d4d1464..4e4f30f 100755
--- a/tests/acloca12.test
+++ b/tests/acloca12.test
@@ -29,17 +29,18 @@ END
mkdir m4
cat >m4/version1.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 >> foo])
-AC_DEFUN([MACRO2], [echo macro21 > foo])
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
EOF
cat >m4/version2.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 >> foo])
+AC_DEFUN([MACRO1], [:macro12:])
EOF
$ACLOCAL --verbose -I m4
$AUTOCONF
-./configure
-grep macro11 foo && Exit 1
-grep macro21 foo && Exit 1
-grep macro12 foo
+$FGREP ':macro11:' configure && Exit 1
+$FGREP ':macro21:' configure && Exit 1
+$FGREP ':macro12:' configure
+
+:
diff --git a/tests/acloca18.test b/tests/acloca18.test
index f68303d..da9cbf5 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -30,96 +30,85 @@ mkdir 1 2 3 4 5 6
cat >1/m1.m4 <<EOF
#serial 1.8.1230.9
-AC_DEFUN([AM_MACRO1], [echo macro11 >> foo])
-AC_DEFUN([AM_MACRO2], [echo macro21 >> foo])
+AC_DEFUN([AM_MACRO1], [:macro11:])
+AC_DEFUN([AM_MACRO2], [:macro21:])
EOF
cat >2/m1.m4 <<EOF
#serial 1.8.1231.9
-AC_DEFUN([AM_MACRO1], [echo macro12 >> foo])
+AC_DEFUN([AM_MACRO1], [:macro12:])
EOF
cat >3/m2.m4 <<EOF
#serial 13
-AC_DEFUN([AM_MACRO2], [echo macro23 >> foo])
+AC_DEFUN([AM_MACRO2], [:macro23:])
EOF
cat >3/m1.m4 <<EOF
#serial 1.8.1230.1
-AC_DEFUN([AM_MACRO1], [echo macro13 >> foo])
+AC_DEFUN([AM_MACRO1], [:macro13:])
EOF
cat >4/mumble.m4 <<EOF
#serial 0
-AC_DEFUN([AM_MACRO1], [echo macro14 >> foo])
+AC_DEFUN([AM_MACRO1], [:macro14:])
EOF
cat >5/ill-formed.m4 <<EOF
#serial bla
#serial .2
#serial
-AC_DEFUN([AM_MACRO1], [echo macro15 >> foo])
+AC_DEFUN([AM_MACRO1], [:macro15:])
EOF
cat >6/after-def.m4 <<EOF
-AC_DEFUN([AM_MACRO1], [echo macro16 >> foo])
+AC_DEFUN([AM_MACRO1], [:macro16:])
#serial 1
EOF
$ACLOCAL -I 1 -I 2 -I 3 -I 4
$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
-$sleep
-rm -f foo
+rm -rf autom4te*.cache
$ACLOCAL -I 1 -I 2 -I 3 -I 4 --install
$AUTOCONF
-./configure
-grep macro12 foo
-grep macro23 foo
+$FGREP ':macro12:' configure
+$FGREP ':macro23:' configure
-$sleep
-rm -f foo
+rm -rf autom4te*.cache
$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install --dry-run
$AUTOCONF
-./configure
-grep macro12 foo
-grep macro23 foo
+$FGREP ':macro12:' configure
+$FGREP ':macro23:' configure
-$sleep
-rm -f foo
+rm -rf autom4te*.cache
$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install
$AUTOCONF
-./configure
-grep macro14 foo
-grep macro23 foo
+$FGREP ':macro14:' configure
+$FGREP ':macro23:' configure
-$sleep
-rm -f foo
+rm -rf autom4te*.cache
$ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
grep 'macro.*AM_MACRO2.*not found' stderr
-$sleep
-rm -f foo
+rm -rf autom4te*.cache
$ACLOCAL -I 4 -I 1 --install
$AUTOCONF
-./configure
-grep macro14 foo
-grep macro21 foo
+$FGREP ':macro14:' configure
+$FGREP ':macro21:' configure
mkdir acdir
ACLOCAL="$ACLOCAL --system-acdir acdir"
-$sleep
+rm -rf autom4te*.cache
cat >acdir/m1.m4 <<EOF
#serial 456
-AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
-AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
+AC_DEFUN([AM_MACRO1], [:macro1d:])
+AC_DEFUN([AM_MACRO2], [:macro2d:])
EOF
-rm -f foo
$ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
cat stderr >&2
cat stdout
diff --git a/tests/acloca20.test b/tests/acloca20.test
index 064fcde..4516d69 100755
--- a/tests/acloca20.test
+++ b/tests/acloca20.test
@@ -19,34 +19,23 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat >foo.m4 <<'END'
-m4_define([FOO], [echo wrong foo])
-END
-
-cat >doit.in <<'END'
address@hidden@ foo.m4 aclocal.m4
-END
-
-cat >configure.in <<'END'
-AC_INIT([acloca20], [1.0])
-AC_PROG_LN_S
-dnl FOO
-AC_CONFIG_FILES([doit], [chmod +x doit])
-AC_OUTPUT
-END
+echo 'm4_define([FOO], [wrong foo])' > foo.m4
+echo 'm4_define([FOO], [right foo])' > acinclude.m4
+echo 'AC_INIT FOO' > configure.in
-$AUTOCONF
-./configure
-./doit
-grep 'wrong foo' aclocal.m4
+chmod a-w foo.m4
+
+# Setup.
+ln -s foo.m4 aclocal.m4 && test -h aclocal.m4 \
+ || skip_ "cannot create symlinks to files"
-cat >acinclude.m4 <<'END'
-m4_define([FOO], [echo right foo])
-END
-sed 's/dnl //' <configure.in >configure.int
-mv -f configure.int configure.in
+# Sanity check.
+grep 'wrong foo' aclocal.m4 \
+ || fatal_ "weird error symlinking aclocal.m4 -> foo.m4"
$ACLOCAL
-$AUTOCONF --force
-./configure | grep 'right foo'
+$AUTOCONF
+grep 'right foo' configure
grep 'wrong foo' foo.m4
+
+:
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
index 3149341..16cdecd 100755
--- a/tests/aclocal9.test
+++ b/tests/aclocal9.test
@@ -28,24 +28,24 @@ END
mkdir m4_1 m4_2
cat >m4_1/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 > foo])
-AC_DEFUN([MACRO2], [echo macro21 >> foo])
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
EOF
cat >m4_2/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 > foo])
+AC_DEFUN([MACRO1], [:macro12:])
EOF
$ACLOCAL -I m4_1 -I m4_2
$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
-$sleep
+rm -rf autom4te*.cache
$ACLOCAL -I m4_2 -I m4_1
$AUTOCONF
-./configure
-grep macro12 foo
-grep macro21 foo
+$FGREP ':macro12:' configure
+$FGREP ':macro21:' configure
+
+:
diff --git a/tests/am-tests-environment.test b/tests/am-tests-environment.test
index 8ad7481..524d8d2 100755
--- a/tests/am-tests-environment.test
+++ b/tests/am-tests-environment.test
@@ -17,7 +17,7 @@
# parallel-tests: check AM_TESTS_ENVIRONMENT support, and its
# interactions with TESTS_ENVIRONMENT.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/amopts-variable-expansion.test
b/tests/amopts-variable-expansion.test
index 57512cc..05fe6c8 100755
--- a/tests/amopts-variable-expansion.test
+++ b/tests/amopts-variable-expansion.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
# We want complete control over automake options.
-AUTOMAKE=$original_AUTOMAKE
+AUTOMAKE=$am_original_AUTOMAKE
cat > configure.in <<END
AC_INIT([$me], [1.0])
diff --git a/tests/backcompat5.test b/tests/backcompat5.test
index bfa45b2..0e57db4 100755
--- a/tests/backcompat5.test
+++ b/tests/backcompat5.test
@@ -19,7 +19,7 @@
# This script can also serve as mild stress-testing for Automake.
# See also the similar test `backcompat6.test'.
-parallel_tests=no
+am_parallel_tests=no
. ./defs || Exit 1
# Yuck!
diff --git a/tests/check-concurrency-bug9245.test
b/tests/check-concurrency-bug9245.test
index e5dd153..966b7a6 100755
--- a/tests/check-concurrency-bug9245.test
+++ b/tests/check-concurrency-bug9245.test
@@ -48,7 +48,7 @@ $MAKE -j1 || Exit 77
for j in '' -j1 -j2; do
$MAKE $j check && Exit 1
TESTS=foo.test $MAKE $j -e check && Exit 1
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
$MAKE $j recheck && Exit 1
TEST_LOGS=foo.log $MAKE $j -e check && Exit 1
rm -f test-suite.log
diff --git a/tests/check-exported-srcdir.test b/tests/check-exported-srcdir.test
index 6d17320..7088de4 100755
--- a/tests/check-exported-srcdir.test
+++ b/tests/check-exported-srcdir.test
@@ -22,7 +22,7 @@
show_info ()
{
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
cat foo.log
cat test-suite.log
else
diff --git a/tests/check-fd-redirect.test b/tests/check-fd-redirect.test
index 6da8704..fb952b4 100755
--- a/tests/check-fd-redirect.test
+++ b/tests/check-fd-redirect.test
@@ -50,7 +50,7 @@ do_check ()
cat stdout
cat stderr >&2
cat four
- test x"$parallel_tests" != x"yes" || cat foo.log
+ test x"$am_parallel_tests" != x"yes" || cat foo.log
test $st -eq 0
grep '[ /]foo\.test: foofoofoo$' stdout
grep '[ /]foo\.test: barbarbar$' stderr
diff --git a/tests/check-no-test-driver.test b/tests/check-no-test-driver.test
index fc1e89b..9406917 100755
--- a/tests/check-no-test-driver.test
+++ b/tests/check-no-test-driver.test
@@ -18,7 +18,7 @@
# installed or referenced when the 'parallel-tests' option is not
# used.
-parallel_tests=no
+am_parallel_tests=no
. ./defs || Exit 1
echo 'TESTS = foo.test' > Makefile.am
diff --git a/tests/check-subst.test b/tests/check-subst.test
index 63ed689..9e31b9a 100755
--- a/tests/check-subst.test
+++ b/tests/check-subst.test
@@ -32,7 +32,7 @@ TESTS = pass-script.test xfail-script.test @script_tests@
XFAIL_TESTS = @xfail_tests@
END
-if test "$parallel_tests" = yes; then
+if test "$am_parallel_tests" = yes; then
unindent >> Makefile.am <<'END'
TEST_EXTENSIONS = .sh .test
SH_LOG_COMPILER = $(SHELL)
@@ -51,7 +51,7 @@ cp pass-script.test subst-pass-script.sh
cp xfail-script.test subst-xfail-script.sh
chmod a+x pass-script.test xfail-script.test
-if test "$parallel_tests" != yes; then
+if test "$am_parallel_tests" != yes; then
chmod a+x subst-pass-script.sh subst-xfail-script.sh
fi
@@ -72,7 +72,7 @@ for vpath in false : ; do
$srcdir/configure
$MAKE all
$MAKE check
- if test "$parallel_tests" = yes; then
+ if test "$am_parallel_tests" = yes; then
ls -l
test -f pass-script.log
test -f xfail-script.log
diff --git a/tests/check-tests-in-builddir.test
b/tests/check-tests-in-builddir.test
index 9182ac2..2cf6f0b 100755
--- a/tests/check-tests-in-builddir.test
+++ b/tests/check-tests-in-builddir.test
@@ -55,7 +55,7 @@ $MAKE check >out 2>&1 || { cat out; Exit1; }
cat out
# The simple-tests driver does not strip VPATH components from
# the name of the test, but the parallel-tests driver should.
-if test x"$parallel_tests" = x"yes"; then
+if test x"$am_parallel_tests" = x"yes"; then
grep '\.\./foo' out && Exit 1
grep '^PASS: foo.test *$' out
else
@@ -68,7 +68,7 @@ rm -f test-suite.log foo.log bar.log
FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; }
cat out
# See comments above.
-if test x"$parallel_tests" = x"yes"; then
+if test x"$am_parallel_tests" = x"yes"; then
grep '\.\./foo' out && Exit 1
grep '^FAIL: foo.test *$' out
else
diff --git a/tests/check.test b/tests/check.test
index f18bb0a..fc81903 100755
--- a/tests/check.test
+++ b/tests/check.test
@@ -22,7 +22,7 @@ cat > Makefile.am << 'END'
TESTS = frob.test
END
-test x"$parallel_tests" != x"yes" || : > test-driver
+test x"$am_parallel_tests" != x"yes" || : > test-driver
: > frob.test
diff --git a/tests/check10.test b/tests/check10.test
index 37f9d08..54f882a 100755
--- a/tests/check10.test
+++ b/tests/check10.test
@@ -17,7 +17,7 @@
# Check singular and plural in test summaries.
# This test only makes sense for the older serial testsuite driver.
-parallel_tests=no
+am_parallel_tests=no
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/check11.test b/tests/check11.test
index bd6be34..f419bfd 100755
--- a/tests/check11.test
+++ b/tests/check11.test
@@ -41,7 +41,7 @@ $AUTOMAKE -a
env TESTS=skip $MAKE -e check >stdout || { cat stdout; Exit 1; }
cat stdout
-if test x"$parallel_tests" = x"yes"; then
+if test x"$am_parallel_tests" = x"yes"; then
count_test_results total=1 pass=0 fail=0 skip=1 xfail=0 xpass=0 error=0
else
grep '1.*passed' stdout && Exit 1
@@ -50,7 +50,7 @@ fi
env TESTS="skip skip2" $MAKE -e check >stdout || { cat stdout; Exit 1; }
cat stdout
-if test x"$parallel_tests" = x"yes"; then
+if test x"$am_parallel_tests" = x"yes"; then
count_test_results total=2 pass=0 fail=0 skip=2 xfail=0 xpass=0 error=0
else
grep '2.*passed' stdout && Exit 1
diff --git a/tests/check12.test b/tests/check12.test
index e36a94d..be4d84e 100755
--- a/tests/check12.test
+++ b/tests/check12.test
@@ -136,7 +136,7 @@ for vpath in : false; do
test -f spanner.log
test -f spanner.sum
# This checks will be run only by the autogenerated `check12-p.test'.
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
test -f test-suite.log
test -f a.log
test -f b.log
@@ -170,7 +170,7 @@ for vpath in : false; do
B_EXIT_STATUS=1 $MAKE check && Exit 1
# This checks will be run only by the autogenerated `check12-p.test'.
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
cat test-suite.log
cat a.log
cat b.log
@@ -193,7 +193,7 @@ for vpath in : false; do
grep 'FAIL: test_hammer' hammer.sum
grep 'FAIL:' spanner.sum && Exit 1
# This checks will be run only by the autogenerated `check12-p.test'.
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
cat test-suite.log
cat a.log
cat b.log
diff --git a/tests/check2.test b/tests/check2.test
index 0424bf8..ec6132d 100755
--- a/tests/check2.test
+++ b/tests/check2.test
@@ -43,7 +43,7 @@ echo.sh:
CLEANFILES = echo.sh
END
-if test x"$parallel_tests" = x"yes"; then
+if test x"$am_parallel_tests" = x"yes"; then
cp "$am_scriptdir/test-driver" .
fi
diff --git a/tests/color.test b/tests/color.test
index 12c1238..1313b7a 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -88,7 +88,7 @@ test_color ()
cat stdout | grep "^${red}XPASS${std}: .*xpass"
# The old serial testsuite driver doesn't distinguish between failures
# and hard errors.
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
cat stdout | grep "^${mgn}ERROR${std}: .*error"
else
cat stdout | grep "^${red}FAIL${std}: .*error"
diff --git a/tests/color2.test b/tests/color2.test
index 96eac46..e143be9 100755
--- a/tests/color2.test
+++ b/tests/color2.test
@@ -99,7 +99,7 @@ test_color ()
cat stdout | grep "^${red}XPASS${std}: .*xpass"
# The old serial testsuite driver doesn't distinguish between failures
# and hard errors.
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
cat stdout | grep "^${mgn}ERROR${std}: .*error"
else
cat stdout | grep "^${red}FAIL${std}: .*error"
diff --git a/tests/cygnus-imply-foreign.test b/tests/cygnus-imply-foreign.test
index 1a8d7d3..51a11f9 100755
--- a/tests/cygnus-imply-foreign.test
+++ b/tests/cygnus-imply-foreign.test
@@ -29,7 +29,7 @@ $ACLOCAL
# We want complete control automake flags, while honouring the
# user overrides for $AUTOMAKE.
-AUTOMAKE=$original_AUTOMAKE
+AUTOMAKE=$am_original_AUTOMAKE
# Sanity check: gnu mode must complain about missing files and
# portability problems.
diff --git a/tests/defs b/tests/defs
index d50cb39..cbeccb9 100644
--- a/tests/defs
+++ b/tests/defs
@@ -122,7 +122,7 @@ esac
## ----------------------- ##
echo "Running from installcheck: $am_running_installcheck"
-echo "Using TAP: $using_tap"
+echo "Using TAP: $am_using_tap"
echo "PATH = $PATH"
@@ -201,22 +201,22 @@ Exit ()
(exit $1); exit $1
}
-if test $using_tap = yes; then
- funcs_file_=tap-functions.sh
+if test $am_using_tap = yes; then
+ am_funcs_file=tap-functions.sh
else
- funcs_file_=plain-functions.sh
+ am_funcs_file=plain-functions.sh
fi
-if test -f "$testsrcdir/$funcs_file_"; then
- . "$testsrcdir/$funcs_file_" || {
- echo "$me: error sourcing $testsrcdir/$funcs_file_" >&2
+if test -f "$testsrcdir/$am_funcs_file"; then
+ . "$testsrcdir/$am_funcs_file" || {
+ echo "$me: error sourcing $testsrcdir/$am_funcs_file" >&2
Exit 99
}
else
- echo "$me: $testsrcdir/$funcs_file_ not found, check \$testsrcdir" >&2
+ echo "$me: $testsrcdir/$am_funcs_file not found, check \$testsrcdir" >&2
Exit 99
fi
-unset funcs_file_
+unset am_funcs_file
# Avoid spurious TAP diagnostic. Keep this in sync with the definition
# of $(TAP_LOG_DRIVER_FLAGS) in `tests/Makefile.am'.
@@ -276,7 +276,7 @@ AUTOMAKE_run ()
$AUTOMAKE ${1+"$@"} >stdout 2>stderr || am__got_rc=$?
cat stderr >&2
cat stdout
- if test $using_tap != yes; then
+ if test $am_using_tap != yes; then
test $am__got_rc -eq $am__exp_rc || Exit 1
return
fi
@@ -483,12 +483,12 @@ sed_unindent_prog="" # Avoid interferences from the
environment.
# get_shell_script SCRIPT-NAME
# -----------------------------
# Fetch an Automake-provided shell script from the `lib/' directory into
-# the current directory, and, if the `$test_prefer_config_shell' variable
-# is set to "yes", modify its shebang line to use $SHELL instead of
-# /bin/sh.
+# the current directory, and, if the `$am_test_prefer_config_shell'
+# variable is set to "yes", modify its shebang line to use $SHELL instead
+# of /bin/sh.
get_shell_script ()
{
- if test x"$test_prefer_config_shell" = x"yes"; then
+ if test x"$am_test_prefer_config_shell" = x"yes"; then
sed "1s|#!.*|#! $SHELL|" "$am_scriptdir/$1" > "$1"
chmod a+x "$1"
else
@@ -573,7 +573,7 @@ do
xsi-bin-sh)
require_xsi "/bin/sh";;
xsi-lib-shell)
- if test x"$test_prefer_config_shell" = x"yes"; then
+ if test x"$am_test_prefer_config_shell" = x"yes"; then
require_xsi "$SHELL"
else
require_xsi "/bin/sh"
@@ -917,7 +917,7 @@ if test "$sh_errexit_works" = yes; then
else
keep_testdirs=no
fi
- if test $using_tap = yes; then
+ if test $am_using_tap = yes; then
if test $have_tap_plan_ != yes && test $exit_status -eq 0; then
plan_ "now"
fi
@@ -944,10 +944,18 @@ if test "$sh_errexit_works" = yes; then
echo "$me: exit $exit_status"
exit $exit_status
' 0
- for signal in 1 2 13 15; do
- trap "fatal_ 'caught signal $signal'" $signal
- done
- unset signal
+ trap "fatal_ 'caught signal SIGHUP'" 1
+ trap "fatal_ 'caught signal SIGINIT'" 2
+ trap "fatal_ 'caught signal SIGTERM'" 15
+ # Ignore further SIGPIPE in the trap code. This is required to avoid
+ # a very weird issue with some shells, at least when the execution of
+ # the automake testsuite is driven by the `prove' utility: if prove
+ # (or the make process that has spawned it) gets interrupted with
+ # Ctrl-C, the shell might go in a loop, continually getting a SIGPIPE,
+ # sometimes finally dumping core, other times hanging indefinitely.
+ # See also Test::Harness bug [rt.cpan.org #70855], archived at
+ # <https://rt.cpan.org/Ticket/Display.html?id=70855>
+ trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13
fi
# Create and populate the temporary directory, if and as required.
@@ -976,7 +984,7 @@ else
# to append AC_OUTPUT.
{
echo "AC_INIT([$me], [1.0])"
- if test x"$parallel_tests" = x"yes"; then
+ if test x"$am_parallel_tests" = x"yes"; then
echo "AM_INIT_AUTOMAKE([parallel-tests])"
else
echo "AM_INIT_AUTOMAKE"
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 44b80ba..df2fd43 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -73,13 +73,13 @@ fi
for var in \
me \
required \
- using_tap \
- parallel_tests \
+ am_using_tap \
+ am_parallel_tests \
am_create_testdir \
am_tap_implementation \
- test_prefer_config_shell \
- original_AUTOMAKE \
- original_ACLOCAL \
+ am_test_prefer_config_shell \
+ am_original_AUTOMAKE \
+ am_original_ACLOCAL \
; do
if eval "test x\"\$$var\" != x" && env | grep "^$var=" >/dev/null; then
echo "$argv0: variable \`$var' is set in the environment:" \
@@ -92,8 +92,8 @@ unset var
# See whether the current test script is expected to use TAP or not.
# Use a sensible default, while allowing the scripts to override this
# check.
-if test -z "$using_tap"; then
- case $argv0 in *.tap) using_tap=yes;; *) using_tap=no;; esac
+if test -z "$am_using_tap"; then
+ case $argv0 in *.tap) am_using_tap=yes;; *) am_using_tap=no;; esac
fi
testsrcdir='@abs_srcdir@'
@@ -152,21 +152,21 @@
AUTOHEADER=${AM_TESTSUITE_AUTOHEADER-${AUTOHEADER-'@am_AUTOHEADER@'}}
AUTOUPDATE=${AM_TESTSUITE_AUTOUPDATE-${AUTOUPDATE-'@am_AUTOUPDATE@'}}
# Tests who want complete control over aclocal or automake command-line
-# options should use $original_ACLOCAL or $original_AUTOMAKE. The
+# options should use $am_original_ACLOCAL or $am_original_AUTOMAKE. The
# `test -z' tests take care not to re-initialize them if defs-static
# is re-sourced, as we want defs-static to remain really idempotent.
-if test -z "$original_AUTOMAKE"; then
- original_AUTOMAKE=${AM_TESTSUITE_AUTOMAKE-${AUTOMAKE-"automake-$APIVERSION"}}
+if test -z "$am_original_AUTOMAKE"; then
+
am_original_AUTOMAKE=${AM_TESTSUITE_AUTOMAKE-${AUTOMAKE-"automake-$APIVERSION"}}
fi
-if test -z "$original_ACLOCAL"; then
- original_ACLOCAL=${AM_TESTSUITE_ACLOCAL-${ACLOCAL-"aclocal-$APIVERSION"}}
+if test -z "$am_original_ACLOCAL"; then
+ am_original_ACLOCAL=${AM_TESTSUITE_ACLOCAL-${ACLOCAL-"aclocal-$APIVERSION"}}
fi
# Use -Werror because this also turns some Perl warnings into error.
# Tests for which this is inappropriate should use -Wno-error.
# Tests who want complete control over aclocal command-line options
-# should use $original_ACLOCAL instead.
-ACLOCAL="$original_ACLOCAL -Werror"
+# should use $am_original_ACLOCAL instead.
+ACLOCAL="$am_original_ACLOCAL -Werror"
# See how Automake should be run. We put --foreign as the default
# strictness to avoid having to create lots and lots of files. A test
@@ -175,8 +175,8 @@ ACLOCAL="$original_ACLOCAL -Werror"
# testing that a warning is enabled by a specific switch) should use
# -Wnone or/and -Wno-error.
# Tests who want complete control over automake command-line options
-# should use $original_AUTOMAKE instead.
-AUTOMAKE="$original_AUTOMAKE --foreign -Werror -Wall"
+# should use $am_original_AUTOMAKE instead.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror -Wall"
# POSIX no longer requires 'egrep' and 'fgrep',
# but some hosts lack 'grep -E' and 'grep -F'.
diff --git a/tests/dejagnu.test b/tests/dejagnu.test
index fe994b5..43bb0f0 100755
--- a/tests/dejagnu.test
+++ b/tests/dejagnu.test
@@ -25,7 +25,7 @@ AUTOMAKE_OPTIONS = dejagnu
TESTS = frob.test
END
-test x"$parallel_tests" != x"yes" || : > test-driver
+test x"$am_parallel_tests" != x"yes" || : > test-driver
$ACLOCAL
$AUTOMAKE
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index fc21487..c547f4a 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -158,7 +158,7 @@ my %deps_extractor =
line_matcher => qr/\btap-summary-aux\.sh\b/,
dist_prereqs => "tap-summary-aux.sh",
},
- is_test_on_tap_with_common_setup =>
+ on_tap_with_common_setup =>
{
line_matcher => qr/\btap-setup\.sh\b/,
dist_prereqs => "tap-setup.sh",
@@ -179,7 +179,7 @@ my %test_generators =
# Makefile.am generated by it define the TESTS variable.
#
# Individual tests can prevent the creation of such a sibling by
- # explicitly setting the `$parallel_tests' variable to either "yes"
+ # explicitly setting the `$am_parallel_tests' variable to either "yes"
# or "no". The rationale for this is that if the variable is set to
# "yes", the test already uses the `parallel-tests' option, so that
# a sibling would be just a duplicate; while if the variable is set
@@ -192,9 +192,9 @@ my %test_generators =
line_matcher =>
qr/(?:^|\s)TESTS\s*=/,
line_rejecter =>
- qr/(?:^[^#]*\bparallel-tests\b)|\bparallel_tests=/,
+ qr/(?:^[^#]*\bparallel-tests\b)|\bam_parallel_tests=/,
shell_setup_code =>
- 'parallel_tests=yes'
+ 'am_parallel_tests=yes'
},
#
# For each test script in the Automake testsuite that tests features
@@ -208,8 +208,8 @@ my %test_generators =
# the `get_shell_script' function anywhere.
#
# Individual tests can prevent the creation of such a sibling by
- # explicitly setting the `$test_prefer_config_shell' variable to
- # either "yes" or "no".
+ # explicitly setting the `$am_test_prefer_config_shell' variable
+ # to either "yes" or "no".
# The rationale for this is that if the variable is set to "yes",
# the test already uses $SHELL, so that a sibling would be just a
# duplicate; while if the variable is set to "no", the test doesn't
@@ -222,9 +222,9 @@ my %test_generators =
line_matcher =>
qr/(^|\s)get_shell_script\s/,
line_rejecter =>
- qr/\btest_prefer_config_shell=/,
+ qr/\bam_test_prefer_config_shell=/,
shell_setup_code =>
- 'test_prefer_config_shell=yes',
+ 'am_test_prefer_config_shell=yes',
},
#
# Tests on tap support should be run with both the perl and awk
@@ -246,7 +246,7 @@ my %test_generators =
parse_options @ARGV;
-my @tests = get_list_of_tests;
+my @all_tests = get_list_of_tests;
print "## -*- Makefile -*-\n";
print "## Generated by $me. DO NOT EDIT BY HAND!\n\n";
@@ -263,9 +263,12 @@ while (my ($k, $x) = each %deps_extractor)
{
my $dist_prereqs = $x->{dist_prereqs} || "";
my $nodist_prereqs = $x->{nodist_prereqs} || "";
- my @logs = grep { line_match $x->{line_matcher}, $_ } @tests;
- map { s/\.[^.]*$//; s/$/\.log/; } @logs;
+ my @tests = grep { line_match $x->{line_matcher}, $_ } @all_tests;
+ map { s/\.[^.]*$//; s/$/\.log/; } (my @logs = @tests);
print "## Added by deps-extracting key `$k'.\n";
+ ## The list of all tests which have a dependency detected by the
+ ## current key.
+ print join(" \\\n ", "${k}_TESTS =", @tests) . "\n";
print "EXTRA_DIST += $dist_prereqs\n";
map { print "$_: $dist_prereqs $nodist_prereqs\n" } @logs;
print "\n";
@@ -289,7 +292,7 @@ while (my ($k, $g) = each %test_generators)
my @wrapped_tests = grep {
line_match ($g->{line_matcher}, $_)
&& !line_match ($g->{line_rejecter}, $_)
- } @tests;
+ } @all_tests;
foreach my $wrapped_test (@wrapped_tests)
{
(my $base = $wrapped_test) =~ s/\.([^.]*)$//;
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
index 3db7e85..a29ffb4 100755
--- a/tests/gnuwarn.test
+++ b/tests/gnuwarn.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
# We need (almost) complete control over automake options.
-AUTOMAKE="$original_AUTOMAKE -Werror"
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
cat >> configure.in << 'END'
AC_PROG_CC
diff --git a/tests/help.test b/tests/help.test
index f0eeed2..71e7f72 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -25,8 +25,8 @@ cd emptydir
# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
-ACLOCAL=$original_ACLOCAL
-AUTOMAKE=$original_AUTOMAKE
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
$ACLOCAL --version
$ACLOCAL --help
diff --git a/tests/help2.test b/tests/help2.test
index f016359..0f710b7 100755
--- a/tests/help2.test
+++ b/tests/help2.test
@@ -24,8 +24,8 @@ cd cleandir
# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
-ACLOCAL=$original_ACLOCAL
-AUTOMAKE=$original_AUTOMAKE
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
echo '[' > configure.in
echo '[' > acinclude.m4
diff --git a/tests/help3.test b/tests/help3.test
index eddd3e1..5c67a14 100755
--- a/tests/help3.test
+++ b/tests/help3.test
@@ -24,8 +24,8 @@ cd cleandir
# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
-ACLOCAL=$original_ACLOCAL
-AUTOMAKE=$original_AUTOMAKE
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
cat > configure.in <<END
AC_INIT([$me], [1.0])
diff --git a/tests/help4.test b/tests/help4.test
index 906803a..aba7145 100755
--- a/tests/help4.test
+++ b/tests/help4.test
@@ -25,8 +25,8 @@ cd emptydir
# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
-ACLOCAL=$original_ACLOCAL
-AUTOMAKE=$original_AUTOMAKE
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
escape_dots () { sed 's/\./\\./g'; } # Avoid issues with `\' in backquotes.
apiversion_rx=`echo "$APIVERSION" | escape_dots`
diff --git a/tests/parallel-tests-cmdline-override.test
b/tests/parallel-tests-cmdline-override.test
index fa47032..c12156e 100755
--- a/tests/parallel-tests-cmdline-override.test
+++ b/tests/parallel-tests-cmdline-override.test
@@ -17,7 +17,7 @@
# Check that we can use indirections when overriding TESTS and
# TEST_LOGS from the command line.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-console-output.test
b/tests/parallel-tests-console-output.test
index 8122bfd..63dd749 100755
--- a/tests/parallel-tests-console-output.test
+++ b/tests/parallel-tests-console-output.test
@@ -17,7 +17,7 @@
# parallel-tests: some checks on console output about testsuite
# progress.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-driver-install.test
b/tests/parallel-tests-driver-install.test
index 10455fb..4fa6dfd 100755
--- a/tests/parallel-tests-driver-install.test
+++ b/tests/parallel-tests-driver-install.test
@@ -17,7 +17,7 @@
# Check that auxiliary script 'test-driver' gets automatically installed
# in the correct directory by 'parallel-tests' option.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
: Try first with parallel-tests defined in AM_INIT_AUTOMAKE.
diff --git a/tests/parallel-tests-dry-run.test
b/tests/parallel-tests-dry-run.test
index 888d888..4791598 100755
--- a/tests/parallel-tests-dry-run.test
+++ b/tests/parallel-tests-dry-run.test
@@ -17,7 +17,7 @@
# Check `make -n' for testsuite-related targets, when `parallel-tests'
# is in use.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-empty-testlogs.test
b/tests/parallel-tests-empty-testlogs.test
index e3d77ea..ea8e705 100755
--- a/tests/parallel-tests-empty-testlogs.test
+++ b/tests/parallel-tests-empty-testlogs.test
@@ -18,7 +18,7 @@
# - empty TESTS
# - empty TEST_LOGS
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-exit-statuses.test
b/tests/parallel-tests-exit-statuses.test
index 840a14a..a2e56a4 100755
--- a/tests/parallel-tests-exit-statuses.test
+++ b/tests/parallel-tests-exit-statuses.test
@@ -17,7 +17,7 @@
# Check parallel-tests features: normal and special exit statuses
# in the test scripts.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-extra-programs.test
b/tests/parallel-tests-extra-programs.test
index f309b4c..51d6ef3 100755
--- a/tests/parallel-tests-extra-programs.test
+++ b/tests/parallel-tests-extra-programs.test
@@ -18,7 +18,7 @@
# (or even be) $(EXTRA_PROGRAMS).
required='cc native'
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-fd-redirect.test
b/tests/parallel-tests-fd-redirect.test
index e00581c..73a134e 100755
--- a/tests/parallel-tests-fd-redirect.test
+++ b/tests/parallel-tests-fd-redirect.test
@@ -22,7 +22,7 @@
# See also the more generic test 'check-fd-redirect.test'.
required='cc native'
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-fork-bomb.test
b/tests/parallel-tests-fork-bomb.test
index 7b616c1..5180ada 100755
--- a/tests/parallel-tests-fork-bomb.test
+++ b/tests/parallel-tests-fork-bomb.test
@@ -18,7 +18,7 @@
# - If $(TEST_SUITE_LOG) is in $(TEST_LOGS), we get a diagnosed
# error, not a make hang or a system freeze.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
# The tricky part of this test is to avoid that make hangs or even
diff --git a/tests/parallel-tests-harderror.test
b/tests/parallel-tests-harderror.test
index f49b79b..3d453d2 100755
--- a/tests/parallel-tests-harderror.test
+++ b/tests/parallel-tests-harderror.test
@@ -16,7 +16,7 @@
# Check parallel-tests features: DISABLE_HARD_ERRORS
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-interrupt.tap
b/tests/parallel-tests-interrupt.tap
index 9e3f2de..ffe4074 100755
--- a/tests/parallel-tests-interrupt.tap
+++ b/tests/parallel-tests-interrupt.tap
@@ -19,7 +19,7 @@
# but we couldn't find a better way to deal with inter-processes
# signals and the whole process-synchronization mess.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
plan_ 16
diff --git a/tests/parallel-tests-log-compiler-1.test
b/tests/parallel-tests-log-compiler-1.test
index 887fcee..2618177 100755
--- a/tests/parallel-tests-log-compiler-1.test
+++ b/tests/parallel-tests-log-compiler-1.test
@@ -19,7 +19,7 @@
# and xxx_LOG_FLAGS), also with AC_SUBST'd stuff.
# See also related test 'parallel-tests-log-compiler-2.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-log-compiler-2.test
b/tests/parallel-tests-log-compiler-2.test
index 0099b7f..a279abd 100755
--- a/tests/parallel-tests-log-compiler-2.test
+++ b/tests/parallel-tests-log-compiler-2.test
@@ -19,7 +19,7 @@
# and xxx_LOG_FLAGS), when some tests are PROGRAMS.
# See also related test 'parallel-tests-log-compiler-1.test'.
-parallel_tests=yes
+am_parallel_tests=yes
required='cc native'
. ./defs || Exit 1
diff --git a/tests/parallel-tests-log-compiler-example.test
b/tests/parallel-tests-log-compiler-example.test
index 95013f1..91fe5b5 100755
--- a/tests/parallel-tests-log-compiler-example.test
+++ b/tests/parallel-tests-log-compiler-example.test
@@ -17,7 +17,7 @@
# Test the example of usage of generic and extension-specific
# LOG_COMPILER and LOG_FLAGS given in the manual.
-parallel_tests=yes
+am_parallel_tests=yes
required=python
. ./defs || Exit 1
diff --git a/tests/parallel-tests-log-override-1.test
b/tests/parallel-tests-log-override-1.test
index 988e424..1b007d7 100755
--- a/tests/parallel-tests-log-override-1.test
+++ b/tests/parallel-tests-log-override-1.test
@@ -16,7 +16,7 @@
# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG).
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<'END'
diff --git a/tests/parallel-tests-log-override-2.test
b/tests/parallel-tests-log-override-2.test
index ef37a2c..da7366b 100755
--- a/tests/parallel-tests-log-override-2.test
+++ b/tests/parallel-tests-log-override-2.test
@@ -18,7 +18,7 @@
# - $(TEST_SUITE_LOG) and $(TESTS)
# - $(TEST_SUITE_LOG) and $(TEST_LOGS)
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<'END'
diff --git a/tests/parallel-tests-log-override-recheck.test
b/tests/parallel-tests-log-override-recheck.test
index 5996895..b969906 100755
--- a/tests/parallel-tests-log-override-recheck.test
+++ b/tests/parallel-tests-log-override-recheck.test
@@ -17,7 +17,7 @@
# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG)
# for the recheck target.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<'END'
diff --git a/tests/parallel-tests-no-color-in-log.test
b/tests/parallel-tests-no-color-in-log.test
index 5d33ac5..97ef19d 100755
--- a/tests/parallel-tests-no-color-in-log.test
+++ b/tests/parallel-tests-no-color-in-log.test
@@ -16,7 +16,7 @@
# Colorized output from the testsuite report shouldn't end up in log files.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
esc=''
diff --git a/tests/parallel-tests-no-spurious-summary.test
b/tests/parallel-tests-no-spurious-summary.test
index 9ef7715..70d9cb7 100755
--- a/tests/parallel-tests-no-spurious-summary.test
+++ b/tests/parallel-tests-no-spurious-summary.test
@@ -17,7 +17,7 @@
# Check that `:test-results:' directives in test scripts' output doesn't
# originate spurious results in the testsuite summary.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-once.test b/tests/parallel-tests-once.test
index d676a12..5f00715 100755
--- a/tests/parallel-tests-once.test
+++ b/tests/parallel-tests-once.test
@@ -18,7 +18,7 @@
# clean directory. An early implementation of the `.trs' intermediate
# files incurred a similar problem.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-reset-term.test
b/tests/parallel-tests-reset-term.test
index 1544c3f..0b3b6d9 100755
--- a/tests/parallel-tests-reset-term.test
+++ b/tests/parallel-tests-reset-term.test
@@ -17,7 +17,7 @@
# Check that the parallel-tests driver correctly handle overrides of the
# TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
esc='['
diff --git a/tests/parallel-tests-subdir.test b/tests/parallel-tests-subdir.test
index 879c858..caae230 100755
--- a/tests/parallel-tests-subdir.test
+++ b/tests/parallel-tests-subdir.test
@@ -17,7 +17,7 @@
# Check that the parallel-tests driver creates parent directories for
# the log files when needed.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-suffix-prog.test
b/tests/parallel-tests-suffix-prog.test
index 1ea730a..cbdd833 100755
--- a/tests/parallel-tests-suffix-prog.test
+++ b/tests/parallel-tests-suffix-prog.test
@@ -18,7 +18,7 @@
# - suffix rules, with PROGRAMS involved
# See also sister test 'parallel-tests-suffix.test'.
-parallel_tests=yes
+am_parallel_tests=yes
required='cc native'
. ./defs || Exit 1
diff --git a/tests/parallel-tests-suffix.test b/tests/parallel-tests-suffix.test
index c56f4bd..f20704a 100755
--- a/tests/parallel-tests-suffix.test
+++ b/tests/parallel-tests-suffix.test
@@ -18,7 +18,7 @@
# - suffix rules
# See also sister test 'parallel-tests-suffix-prog.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests-unreadable.test
b/tests/parallel-tests-unreadable.test
index 6192a13..2b4d077 100755
--- a/tests/parallel-tests-unreadable.test
+++ b/tests/parallel-tests-unreadable.test
@@ -17,7 +17,7 @@
# Check that the testsuite driver copes well with unreadable `.log'
# and `.trs' files.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
: > t
diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
index 014adfc..1b03710 100755
--- a/tests/parallel-tests.test
+++ b/tests/parallel-tests.test
@@ -23,7 +23,7 @@
# - TEST_LOGS redefinition at runtime
# - RECHECK_LOGS redefinition at runtime
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests10.test b/tests/parallel-tests10.test
index 5718611..eca57f8 100755
--- a/tests/parallel-tests10.test
+++ b/tests/parallel-tests10.test
@@ -18,7 +18,7 @@
# - trailing whitespace in TESTS
# GNU make 3.80 may expand trailing white space to `.log'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index ab390f8..d2abc8b 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -19,7 +19,7 @@
# - recheck-html
# Keep this in sync with sister test `test-driver-custom-html.test'.
-parallel_tests=yes
+am_parallel_tests=yes
required=rst2html
. ./defs || Exit 1
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index a140988..fd33564 100755
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -17,7 +17,7 @@
# Check parallel-tests features:
# - concurrent parallel execution
-parallel_tests=yes
+am_parallel_tests=yes
required=GNUmake
. ./defs || Exit 1
diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test
index 6b3e70b..cd062bd 100755
--- a/tests/parallel-tests5.test
+++ b/tests/parallel-tests5.test
@@ -20,7 +20,7 @@
# Actually, this test doesn't ensure that things happen concurrently.
# It merely serves as demonstration. :-)
-parallel_tests=yes
+am_parallel_tests=yes
required='cc native GNUmake'
. ./defs || Exit 1
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
index e0c535e..eac4cf1 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests6.test
@@ -19,7 +19,7 @@
# BSD make will expand `$(TESTS:=.log)' to `.log' unless overridden.
# See parallel-tests10.test for a similar issue.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
AC_OUTPUT
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index 84ac460..560f9d4 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.test
@@ -24,7 +24,7 @@
# manual for the ugliness in this area, when VPATH comes into
# play. :-/
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index fb68d51..bef1674 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -17,7 +17,7 @@
# Check parallel-tests features:
# - recheck
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/pr401.test b/tests/pr401.test
index b2f3c11..7a2662b 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -18,7 +18,7 @@
# Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
# (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
-parallel_tests=no
+am_parallel_tests=no
required=cc
. ./defs || Exit 1
diff --git a/tests/pr401b.test b/tests/pr401b.test
index ccd5cbd..ad14b4d 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -18,7 +18,7 @@
# Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS.
# (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA)
-parallel_tests=no
+am_parallel_tests=no
required='cc libtoolize'
. ./defs || Exit 1
diff --git a/tests/pr401c.test b/tests/pr401c.test
index 3db12ee..8649b91 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -18,7 +18,7 @@
# Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
# (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
-parallel_tests=no
+am_parallel_tests=no
required=cc
. ./defs || Exit 1
diff --git a/tests/prove-runner b/tests/prove-runner
new file mode 100755
index 0000000..41c4c52
--- /dev/null
+++ b/tests/prove-runner
@@ -0,0 +1,50 @@
+#!/bin/sh
+# Helper script to run the automake testsuite through the `prove' utility.
+# See the "prove" and "installprove" targets in tests/Makefile.am.
+
+set -u
+
+nl='
+'
+
+tst=$1
+shift
+
+case $tst in
+ *.test)
+ echo 1..1
+ # Protect the output contents of the test script, since it might
+ # sometimes contain TAP lines that would confuse `prove'. This
+ # This has already happened in practice, especially for the tests
+ # checking TAP support in automake-generated test harnesses.
+ (${TEST_RUNNER-} "$tst" ${1+"$@"}; echo exit status: $?) 2>&1 | awk '
+ BEGIN { lastine = "exit status: 255"; }
+ { print " " $0; lastline = $0; }
+ END { st = lastline; sub("^exit status: *", "", st); exit st; }
+ '
+ st=$?
+ if test $st -eq 99; then
+ echo "not ok - $tst: hard failure (exit status $st)"
+ elif test $st -eq 77; then
+ echo "ok - $tst # SKIP"
+ else
+ case " ${XFAIL_TESTS-} " in
+ *" $tst "*) xs=' # TODO';;
+ *) xs='';;
+ esac
+ if test $st -eq 0; then
+ echo "ok - test script $tst passed$xs"
+ else
+ echo "not ok - test script $tst failed (exit status $st)$xs"
+ fi
+ fi
+ exit 0
+ ;;
+ *.tap)
+ ${TAP_RUNNER-} "$tst" ${1+"$@"} 2>&1
+ exit $?
+ ;;
+esac
+
+echo "Bail out! Invalid test script name '$tst'"
+exit 99
diff --git a/tests/self-check-env-sanitize.tap
b/tests/self-check-env-sanitize.tap
index ad6fb31..8736c54 100755
--- a/tests/self-check-env-sanitize.tap
+++ b/tests/self-check-env-sanitize.tap
@@ -28,14 +28,14 @@ plan_ 18 # Two times the number of variable names in $vars.
vars='
me
- parallel_tests
required
- using_tap
+ am_parallel_tests
+ am_using_tap
am_create_testdir
am_tap_implementation
- test_prefer_config_shell
- original_AUTOMAKE
- original_ACLOCAL
+ am_test_prefer_config_shell
+ am_original_AUTOMAKE
+ am_original_ACLOCAL
'
do_run ()
diff --git a/tests/self-check-tap.test b/tests/self-check-tap.test
index 43a8bac..29350ef 100755
--- a/tests/self-check-tap.test
+++ b/tests/self-check-tap.test
@@ -15,20 +15,29 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Sanity check for the automake testsuite.
-# Make sure that $using_tap gets automatically defined by `./defs-static',
-# but can be overridden by the individual tests.
+# Make sure that $am_using_tap gets automatically defined by
+# `./defs-static', but can be overridden by the individual tests.
. ./defs-static || exit 1
set -ex
-$SHELL -c '. ./defs-static && test $using_tap = yes' foo.tap
-$SHELL -c '. ./defs-static && test $using_tap = no' foo.test
-$SHELL -c '. ./defs-static && test $using_tap = no' tap
-$SHELL -c '. ./defs-static && test $using_tap = no' tap.test
-$SHELL -c '. ./defs-static && test $using_tap = no' foo-tap
+$SHELL -c '. ./defs-static && test $am_using_tap = yes' foo.tap
+$SHELL -c '. ./defs-static && test $am_using_tap = no' foo.test
+$SHELL -c '. ./defs-static && test $am_using_tap = no' tap
+$SHELL -c '. ./defs-static && test $am_using_tap = no' tap.test
+$SHELL -c '. ./defs-static && test $am_using_tap = no' foo-tap
-$SHELL -c 'using_tap=no; . ./defs-static; test $using_tap = no' foo.tap
-$SHELL -c 'using_tap=yes; . ./defs-static; test $using_tap = yes' foo.test
+$SHELL -c '
+ am_using_tap=no
+ . ./defs-static
+ test $am_using_tap = no
+' foo.tap
+
+$SHELL -c '
+ am_using_tap=yes
+ . ./defs-static
+ test $am_using_tap = yes
+' foo.test
:
diff --git a/tests/strictness-override.test b/tests/strictness-override.test
index aacb561..34ceae0 100755
--- a/tests/strictness-override.test
+++ b/tests/strictness-override.test
@@ -24,7 +24,7 @@
. ./defs || Exit 1
# We want complete control over automake options.
-AUTOMAKE=$original_AUTOMAKE
+AUTOMAKE=$am_original_AUTOMAKE
cat > Makefile.am <<'END'
AUTOMAKE_OPTIONS =
diff --git a/tests/strictness-precedence.test b/tests/strictness-precedence.test
index a949215..0198fa6 100755
--- a/tests/strictness-precedence.test
+++ b/tests/strictness-precedence.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
# We want complete control over automake options.
-AUTOMAKE=$original_AUTOMAKE
+AUTOMAKE=$am_original_AUTOMAKE
cat > Makefile.am <<'END'
AUTOMAKE_OPTIONS =
diff --git a/tests/tap-ambiguous-directive.test
b/tests/tap-ambiguous-directive.test
index 78f9684..203fb8a 100755
--- a/tests/tap-ambiguous-directive.test
+++ b/tests/tap-ambiguous-directive.test
@@ -18,7 +18,7 @@
# - handling of "ambiguous" TODO and SKIP directives
# See also related test 'tap-todo-skip-together.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-autonumber.test b/tests/tap-autonumber.test
index 12dec11..c0b6d5d 100755
--- a/tests/tap-autonumber.test
+++ b/tests/tap-autonumber.test
@@ -20,7 +20,7 @@
# - test results without number get automatically numbered in the
# console progress output
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-bad-prog.tap b/tests/tap-bad-prog.tap
index 3cc5e21..900c531 100755
--- a/tests/tap-bad-prog.tap
+++ b/tests/tap-bad-prog.tap
@@ -18,7 +18,7 @@
# - missing, unreadable, or not-executable test scripts cause proper
# error reports
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
plan_ 5
diff --git a/tests/tap-bailout-and-logging.test
b/tests/tap-bailout-and-logging.test
index 9854ea8..65e2934 100755
--- a/tests/tap-bailout-and-logging.test
+++ b/tests/tap-bailout-and-logging.test
@@ -18,7 +18,7 @@
# - even after a "Bail out!" directive, all input is still copied in
# the log file
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-bailout-suppress-badexit.test
b/tests/tap-bailout-suppress-badexit.test
index 059394c..080557e 100755
--- a/tests/tap-bailout-suppress-badexit.test
+++ b/tests/tap-bailout-suppress-badexit.test
@@ -18,7 +18,7 @@
# - A "Bail out!" directive causes the driver to ignore the exit
# status of the test script.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
tests='exit.test exit127.test sighup.test sigterm.test'
diff --git a/tests/tap-bailout-suppress-later-diagnostic.test
b/tests/tap-bailout-suppress-later-diagnostic.test
index 679343f..5389fed 100755
--- a/tests/tap-bailout-suppress-later-diagnostic.test
+++ b/tests/tap-bailout-suppress-later-diagnostic.test
@@ -18,7 +18,7 @@
# - A "Bail out!" directive causes the driver to ignore any TAP
# diagnostic message in the rest of the following TAP stream.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-bailout-suppress-later-errors.test
b/tests/tap-bailout-suppress-later-errors.test
index 19aa9e2..c636289 100755
--- a/tests/tap-bailout-suppress-later-errors.test
+++ b/tests/tap-bailout-suppress-later-errors.test
@@ -18,7 +18,7 @@
# - A "Bail out!" directive causes the driver to ignore any TAP
# result or error in the rest of the following TAP stream.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-bailout.test b/tests/tap-bailout.test
index 8354b27..d5b6330 100755
--- a/tests/tap-bailout.test
+++ b/tests/tap-bailout.test
@@ -17,7 +17,7 @@
# Basic TAP test protocol support:
# - "Bail out!" magic
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-basic.test b/tests/tap-basic.test
index dde65f2..8e39161 100755
--- a/tests/tap-basic.test
+++ b/tests/tap-basic.test
@@ -24,7 +24,7 @@
# Note that some of the features checked here are checked in other
# test cases too, usually in a more thorough and detailed way.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
fetch_tap_driver
diff --git a/tests/tap-color.test b/tests/tap-color.test
index 16fea15..5884a2b 100755
--- a/tests/tap-color.test
+++ b/tests/tap-color.test
@@ -17,7 +17,7 @@
# TAP support:
# - colorization of TAP results and diagnostic messages
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
TERM=ansi; export TERM
diff --git a/tests/tap-common-setup.test b/tests/tap-common-setup.test
index 92ae3c4..2bcd9e6 100755
--- a/tests/tap-common-setup.test
+++ b/tests/tap-common-setup.test
@@ -16,7 +16,7 @@
# Auxiliary test to set up common data used by many tests on TAP support.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << END
diff --git a/tests/tap-deps.test b/tests/tap-deps.test
index 2f9459d..74612ed 100755
--- a/tests/tap-deps.test
+++ b/tests/tap-deps.test
@@ -17,7 +17,7 @@
# Basic TAP test protocol support:
# - dependencies between test scripts
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
diff --git a/tests/tap-diagnostic-custom.test b/tests/tap-diagnostic-custom.test
index 88c859c..05f0875 100755
--- a/tests/tap-diagnostic-custom.test
+++ b/tests/tap-diagnostic-custom.test
@@ -18,7 +18,7 @@
# - option '--diagnostic-string' to customize the string introducing
# TAP diagnostics
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
fetch_tap_driver
diff --git a/tests/tap-diagnostic.test b/tests/tap-diagnostic.test
index 3c7da79..16101af 100755
--- a/tests/tap-diagnostic.test
+++ b/tests/tap-diagnostic.test
@@ -18,7 +18,7 @@
# - diagnostic messages (TAP lines with leading "#")
# - flags '--comments' and '--no-comments' of the TAP test driver
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-doc.test b/tests/tap-doc.test
index 8ccd30f..174e5e5 100755
--- a/tests/tap-doc.test
+++ b/tests/tap-doc.test
@@ -17,7 +17,7 @@
# Check that an example given in the documentation really works.
# See section "Simple Tests" subsection "Script-based Testsuites".
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
fetch_tap_driver
diff --git a/tests/tap-doc2.test b/tests/tap-doc2.test
index dc69654..258f2d3 100755
--- a/tests/tap-doc2.test
+++ b/tests/tap-doc2.test
@@ -19,7 +19,7 @@
# with the Automake test harness".
am_create_testdir=empty
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am <<'END'
diff --git a/tests/tap-driver-stderr.test b/tests/tap-driver-stderr.test
index 1147341..5938baf 100755
--- a/tests/tap-driver-stderr.test
+++ b/tests/tap-driver-stderr.test
@@ -18,7 +18,7 @@
# - error messages from awk/shell/perl goes to the console
required=non-root
-parallel_tests=yes
+am_parallel_tests=yes
am_create_testdir=empty
. ./defs || Exit 1
diff --git a/tests/tap-empty-diagnostic.test b/tests/tap-empty-diagnostic.test
index 6bcb8ce..78b95ba 100755
--- a/tests/tap-empty-diagnostic.test
+++ b/tests/tap-empty-diagnostic.test
@@ -17,7 +17,7 @@
# TAP support:
# - empty diagnostic messages are discarder
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-empty.test b/tests/tap-empty.test
index 557b7c7..3d7a0a1 100755
--- a/tests/tap-empty.test
+++ b/tests/tap-empty.test
@@ -18,7 +18,7 @@
# - empty TAP input
# - blank TAP input
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-escape-directive-2.test
b/tests/tap-escape-directive-2.test
index e0dd37b..41c4e74 100755
--- a/tests/tap-escape-directive-2.test
+++ b/tests/tap-escape-directive-2.test
@@ -17,7 +17,7 @@
# TAP support:
# - "escape" TODO and SKIP directives (by escaping the "#" character)
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-escape-directive.test b/tests/tap-escape-directive.test
index 194db6a..4bcec59 100755
--- a/tests/tap-escape-directive.test
+++ b/tests/tap-escape-directive.test
@@ -17,7 +17,7 @@
# TAP support:
# - "escape" TODO and SKIP directives (by escaping the "#" character)
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-exit.test b/tests/tap-exit.test
index 381adff..6cb3053 100755
--- a/tests/tap-exit.test
+++ b/tests/tap-exit.test
@@ -19,7 +19,7 @@
# - the `--ignore-exit' option causes the TAP test driver to ignore
# exit statuses of the test scripts.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
echo TESTS = > Makefile.am
diff --git a/tests/tap-fancy.test b/tests/tap-fancy.test
index 3348db7..b89aa09 100755
--- a/tests/tap-fancy.test
+++ b/tests/tap-fancy.test
@@ -17,7 +17,7 @@
# TAP support: some unusual forms for valid TAP input.
# See also related test 'tap-fancy2.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-fancy2.test b/tests/tap-fancy2.test
index 36e0f29..b661146 100755
--- a/tests/tap-fancy2.test
+++ b/tests/tap-fancy2.test
@@ -17,7 +17,7 @@
# TAP support: more unusual forms for valid TAP input.
# See also related test 'tap-fancy.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-global-log.test b/tests/tap-global-log.test
index d343581..a442602 100755
--- a/tests/tap-global-log.test
+++ b/tests/tap-global-log.test
@@ -17,7 +17,7 @@
# TAP support:
# - which log files get copied in the global log?
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-global-result.test b/tests/tap-global-result.test
index 7b83e6a..ff825da 100755
--- a/tests/tap-global-result.test
+++ b/tests/tap-global-result.test
@@ -18,7 +18,7 @@
# - which global test result derives from different test results
# mixed in a single script?
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-html.test b/tests/tap-html.test
index 07c0294..ca0ffd0 100755
--- a/tests/tap-html.test
+++ b/tests/tap-html.test
@@ -18,7 +18,7 @@
# - "check-html" and "recheck-html" targets
# - reStructuredText -> HTML conversion
-parallel_tests=yes
+am_parallel_tests=yes
required=rst2html
. ./defs || Exit 1
diff --git a/tests/tap-log.test b/tests/tap-log.test
index eecb2a2..ff832f2 100755
--- a/tests/tap-log.test
+++ b/tests/tap-log.test
@@ -22,7 +22,7 @@
# - VERBOSE environment variable support
# Keep in sync with 'test-log.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
diff --git a/tests/tap-merge-stdout-stderr.test
b/tests/tap-merge-stdout-stderr.test
index 4da9f38..6c07048 100755
--- a/tests/tap-merge-stdout-stderr.test
+++ b/tests/tap-merge-stdout-stderr.test
@@ -18,7 +18,7 @@
# - The Automake TAP driver has an option that instruct it to read TAP
# input also from the stderr of the test command, not only its stdout.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
fetch_tap_driver
diff --git a/tests/tap-missing-plan-and-bad-exit.test
b/tests/tap-missing-plan-and-bad-exit.test
index 48c6fcc..8a0c40f 100755
--- a/tests/tap-missing-plan-and-bad-exit.test
+++ b/tests/tap-missing-plan-and-bad-exit.test
@@ -19,7 +19,7 @@
# plan, then the driver reports both "missing plan" and "exited with
# non-zero status" errors.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > foo.test <<END
diff --git a/tests/tap-more.test b/tests/tap-more.test
index 375aa00..fcad2fc 100755
--- a/tests/tap-more.test
+++ b/tests/tap-more.test
@@ -24,7 +24,7 @@
# correct test script(s)
# - "make distcheck" works
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
fetch_tap_driver
diff --git a/tests/tap-more2.test b/tests/tap-more2.test
index f6f1ca1..b1031f2 100755
--- a/tests/tap-more2.test
+++ b/tests/tap-more2.test
@@ -20,7 +20,7 @@
# - interactions with `check_*' variables
required='cc native'
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
fetch_tap_driver
diff --git a/tests/tap-msg0-bailout.test b/tests/tap-msg0-bailout.test
index 6aa6d60..9e326b4 100755
--- a/tests/tap-msg0-bailout.test
+++ b/tests/tap-msg0-bailout.test
@@ -19,7 +19,7 @@
# of a "plan with skip" TAP plan
# generally true!
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-msg0-directive.test b/tests/tap-msg0-directive.test
index 6ec63f7..a61cbf8 100755
--- a/tests/tap-msg0-directive.test
+++ b/tests/tap-msg0-directive.test
@@ -17,7 +17,7 @@
# TAP support:
# - literal string "0" as a TODO or SKIP message
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-msg0-misc.test b/tests/tap-msg0-misc.test
index c9399bf..6202689 100755
--- a/tests/tap-msg0-misc.test
+++ b/tests/tap-msg0-misc.test
@@ -18,7 +18,7 @@
# - literal "0" and "0.0" in a test description and a TODO/SKIP message
# at the same time
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-msg0-planskip.test b/tests/tap-msg0-planskip.test
index b8c3d6c..d10acc3 100755
--- a/tests/tap-msg0-planskip.test
+++ b/tests/tap-msg0-planskip.test
@@ -18,7 +18,7 @@
# - literal strings "0" and "0.0" as the reason of the skip in a "TAP
# plan with skip" (i.e., "1..0 # SKIP ...").
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-msg0-result.test b/tests/tap-msg0-result.test
index 86259e5..c616a8a 100755
--- a/tests/tap-msg0-result.test
+++ b/tests/tap-msg0-result.test
@@ -17,7 +17,7 @@
# TAP support:
# - the string "0" as a test description
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-negative-numbers.test b/tests/tap-negative-numbers.test
index 9fdee87..944803d 100755
--- a/tests/tap-negative-numbers.test
+++ b/tests/tap-negative-numbers.test
@@ -18,7 +18,7 @@
# - don't spuriously recognize negative TAP result numbers, but correctly
# interpret them as test descriptions instead
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-no-disable-hard-error.test
b/tests/tap-no-disable-hard-error.test
index 678e184..0ea4409 100755
--- a/tests/tap-no-disable-hard-error.test
+++ b/tests/tap-no-disable-hard-error.test
@@ -18,7 +18,7 @@
# - "Bail out!" magic and TAP parse errors are not disabled nor turned
# into simple failures by the definition DISABLE_HARD_ERRORS.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
diff --git a/tests/tap-no-merge-stdout-stderr.test
b/tests/tap-no-merge-stdout-stderr.test
index 25a06fd..a7a0da0 100755
--- a/tests/tap-no-merge-stdout-stderr.test
+++ b/tests/tap-no-merge-stdout-stderr.test
@@ -18,7 +18,7 @@
# - By default, TAP input is only from the stdout (and not the stderr)
# of the test command.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
diff --git a/tests/tap-no-spurious-numbers.test
b/tests/tap-no-spurious-numbers.test
index e3ee0c8..0c49995 100755
--- a/tests/tap-no-spurious-numbers.test
+++ b/tests/tap-no-spurious-numbers.test
@@ -18,7 +18,7 @@
# - we shouldn't spuriously recognize as TAP result numbers what it
# not, even if it seems pretty close
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-no-spurious-summary.test
b/tests/tap-no-spurious-summary.test
index bc7fd51..12b54b5 100755
--- a/tests/tap-no-spurious-summary.test
+++ b/tests/tap-no-spurious-summary.test
@@ -18,7 +18,7 @@
# - `:test-results:' directives in test scripts' output doesn't
# originate spurious results in the testsuite summary
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-no-spurious.test b/tests/tap-no-spurious.test
index 3e2afac..bf3d7ae 100755
--- a/tests/tap-no-spurious.test
+++ b/tests/tap-no-spurious.test
@@ -18,7 +18,7 @@
# - don't spuriously recognize lines that are "almost" TAP lines as
# real TAP lines
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-not-ok-skip.test b/tests/tap-not-ok-skip.test
index f154d23..10597ef 100755
--- a/tests/tap-not-ok-skip.test
+++ b/tests/tap-not-ok-skip.test
@@ -18,7 +18,7 @@
# - a "not ok # SKIP" line should count as a failure, for consistency
# with the prove(1) utility.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-number-wordboundary.test
b/tests/tap-number-wordboundary.test
index 74cddc1..63c04e6 100755
--- a/tests/tap-number-wordboundary.test
+++ b/tests/tap-number-wordboundary.test
@@ -18,7 +18,7 @@
# - TAP result numbers terminated by a non-whitespace "word boundary"
# character are recognized
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-numbers-leading-zero.test
b/tests/tap-numbers-leading-zero.test
index 81c9797..a58132e 100755
--- a/tests/tap-numbers-leading-zero.test
+++ b/tests/tap-numbers-leading-zero.test
@@ -17,7 +17,7 @@
# TAP support:
# - how does TAP result numbers with leading zero fares?
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-numeric-description.test
b/tests/tap-numeric-description.test
index ea01038..7fcb685 100755
--- a/tests/tap-numeric-description.test
+++ b/tests/tap-numeric-description.test
@@ -16,7 +16,7 @@
# TAP result lines whose description is a number.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-out-of-order.test b/tests/tap-out-of-order.test
index 9bf4685..0e3beba 100755
--- a/tests/tap-out-of-order.test
+++ b/tests/tap-out-of-order.test
@@ -17,7 +17,7 @@
# TAP support:
# - out-of-order test results
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-passthrough-exit.test b/tests/tap-passthrough-exit.test
index 68d7071..a232601 100755
--- a/tests/tap-passthrough-exit.test
+++ b/tests/tap-passthrough-exit.test
@@ -19,7 +19,7 @@
# log file
# See also related test 'tap-passthrough.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
diff --git a/tests/tap-passthrough.test b/tests/tap-passthrough.test
index 6406548..28501cd 100755
--- a/tests/tap-passthrough.test
+++ b/tests/tap-passthrough.test
@@ -20,7 +20,7 @@
# - TAP errors are reported in the log file too
# See also related test 'tap-passthrough-exit.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
weirdchars=\''"address@hidden&()[]<>#;,:.^?*/'
diff --git a/tests/tap-plan-corner.test b/tests/tap-plan-corner.test
index a818344..7718930 100755
--- a/tests/tap-plan-corner.test
+++ b/tests/tap-plan-corner.test
@@ -17,7 +17,7 @@
# TAP support:
# - some corner cases for TAP plan
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-plan-errors.test b/tests/tap-plan-errors.test
index 9d8abcd..e3c02c8 100755
--- a/tests/tap-plan-errors.test
+++ b/tests/tap-plan-errors.test
@@ -23,7 +23,7 @@
# and 'tap-skip-whole-badcount.test'. More checks about corner-cases
# in TAP plans are performed in 'tap-plan-corner.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-plan-leading-zero.test b/tests/tap-plan-leading-zero.test
index 4c54649..14bf439 100755
--- a/tests/tap-plan-leading-zero.test
+++ b/tests/tap-plan-leading-zero.test
@@ -19,7 +19,7 @@
# - TAP "SKIP" plans with multiple zeroes, as in "1..00 # SKIP"
# This is consistent with the behaviour of the `prove' utility.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-plan-malformed.test b/tests/tap-plan-malformed.test
index 9eb8698..8b0fa8a 100755
--- a/tests/tap-plan-malformed.test
+++ b/tests/tap-plan-malformed.test
@@ -17,7 +17,7 @@
# TAP support: a malformed TAP plan is not recognized. The checks in
# here should be consistent with the behaviour of the `prove' utility.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-plan-middle.test b/tests/tap-plan-middle.test
index 88bb647..7e90944 100755
--- a/tests/tap-plan-middle.test
+++ b/tests/tap-plan-middle.test
@@ -17,7 +17,7 @@
# TAP support:
# - test plan preceding and/or following non-result TAP lines
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-plan-whitespace.test b/tests/tap-plan-whitespace.test
index 3cdd79d..c62f751 100755
--- a/tests/tap-plan-whitespace.test
+++ b/tests/tap-plan-whitespace.test
@@ -17,7 +17,7 @@
# TAP support:
# - plan line with trailing whitespace is recognized and handled correctly
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-plan.test b/tests/tap-plan.test
index e2fda35..6b0513a 100755
--- a/tests/tap-plan.test
+++ b/tests/tap-plan.test
@@ -18,7 +18,7 @@
# - test scripts with the test plan at the beginning
# - test scripts with the test plan at the end
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-and-logging.test
b/tests/tap-planskip-and-logging.test
index 621608b..9059a38 100755
--- a/tests/tap-planskip-and-logging.test
+++ b/tests/tap-planskip-and-logging.test
@@ -18,7 +18,7 @@
# - interactions between "TAP plan with SKIP" and logging of earlier or
# later TAP or non-TAP text
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-badexit.test b/tests/tap-planskip-badexit.test
index 76ba692..9638867 100755
--- a/tests/tap-planskip-badexit.test
+++ b/tests/tap-planskip-badexit.test
@@ -18,7 +18,7 @@
# - an exit status != 0 of a test script causes an hard error, even if
# the last line of output is a "SKIP plan" (e.g., "1..0 # SKIP").
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
echo TESTS = one.test two.test > Makefile.am
diff --git a/tests/tap-planskip-bailout.test b/tests/tap-planskip-bailout.test
index 0048e00..039de23 100755
--- a/tests/tap-planskip-bailout.test
+++ b/tests/tap-planskip-bailout.test
@@ -18,7 +18,7 @@
# - a "Bail out!" directive causes an hard error, even if coming after
# a "SKIP plan" (e.g., "1..0 # SKIP").
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-case-insensitive.test
b/tests/tap-planskip-case-insensitive.test
index 2ed2626..6ae8b63 100755
--- a/tests/tap-planskip-case-insensitive.test
+++ b/tests/tap-planskip-case-insensitive.test
@@ -17,7 +17,7 @@
# TAP support:
# - "SKIP" keyword in a TAP plan is case-insensitive
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-late.test b/tests/tap-planskip-late.test
index c2cb0a8..a246bb9 100755
--- a/tests/tap-planskip-late.test
+++ b/tests/tap-planskip-late.test
@@ -18,7 +18,7 @@
# - the special "plan with SKIP" can also be used "late" in the TAP
# stream, i.e., preceded by non-TAP output or TAP diagnostic.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-later-errors.test
b/tests/tap-planskip-later-errors.test
index eb2ee26..cf935a1 100755
--- a/tests/tap-planskip-later-errors.test
+++ b/tests/tap-planskip-later-errors.test
@@ -17,7 +17,7 @@
# TAP support:
# - TAP errors following a "TAP plan with SKIP" are still diagnosed.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-unplanned-corner.test
b/tests/tap-planskip-unplanned-corner.test
index 4e825d5..a2ee90a 100755
--- a/tests/tap-planskip-unplanned-corner.test
+++ b/tests/tap-planskip-unplanned-corner.test
@@ -18,7 +18,7 @@
# - test results seen in a TAP stream that has a "plan with SKIP" are
# flagged as errors, even if all of them are "SKIP" results.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-unplanned.test
b/tests/tap-planskip-unplanned.test
index 6286dac..c5e3ccb 100755
--- a/tests/tap-planskip-unplanned.test
+++ b/tests/tap-planskip-unplanned.test
@@ -19,7 +19,7 @@
# been seen is an error
# - any test result following a "plan with skip" is an error.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip-whitespace.test
b/tests/tap-planskip-whitespace.test
index bf83241..7962e19 100755
--- a/tests/tap-planskip-whitespace.test
+++ b/tests/tap-planskip-whitespace.test
@@ -18,7 +18,7 @@
# - normalization of whitespace in console testsuite progress associated
# with a SKIP directive in the TAP plan
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-planskip.test b/tests/tap-planskip.test
index 35f7976..0f24462 100755
--- a/tests/tap-planskip.test
+++ b/tests/tap-planskip.test
@@ -17,7 +17,7 @@
# Basic TAP test protocol support:
# - special plan format to skip all the tests in a script
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index 61476c3..1b3d239 100755
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -22,7 +22,7 @@
# children, and is pretty hacky and complex; is there a better way to
# accomplish the checks done here?
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >expect-check <<'END'
diff --git a/tests/tap-recheck-logs.test b/tests/tap-recheck-logs.test
index 6e1b646..d7852c6 100755
--- a/tests/tap-recheck-logs.test
+++ b/tests/tap-recheck-logs.test
@@ -17,7 +17,7 @@
# TAP support:
# - RECHECK_LOGS
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
diff --git a/tests/tap-recheck.test b/tests/tap-recheck.test
index 0139b07..09c17f4 100755
--- a/tests/tap-recheck.test
+++ b/tests/tap-recheck.test
@@ -17,7 +17,7 @@
# Test the 'recheck' target for TAP test protocol.
# Keep in sync with 'test-driver-custom-multitest-recheck.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
fetch_tap_driver
diff --git a/tests/tap-result-comment.test b/tests/tap-result-comment.test
index 0cfee01..ef7fc11 100755
--- a/tests/tap-result-comment.test
+++ b/tests/tap-result-comment.test
@@ -17,7 +17,7 @@
# TAP support:
# - non-directive comments in TAP results are kept verbatim
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-signal.tap b/tests/tap-signal.tap
index 31793d4..e27962e 100755
--- a/tests/tap-signal.tap
+++ b/tests/tap-signal.tap
@@ -17,7 +17,7 @@
# TAP support:
# - a test script terminated by a signal causes an hard error
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
plan_ 10
diff --git a/tests/tap-summary-aux.sh b/tests/tap-summary-aux.sh
index 7def11d..f98f4e3 100755
--- a/tests/tap-summary-aux.sh
+++ b/tests/tap-summary-aux.sh
@@ -16,7 +16,7 @@
# Auxiliary script for tests on TAP support: checking testsuite summary.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
br='============================================================================'
diff --git a/tests/tap-test-number-0.test b/tests/tap-test-number-0.test
index 1f7681f..8a117ce 100755
--- a/tests/tap-test-number-0.test
+++ b/tests/tap-test-number-0.test
@@ -18,7 +18,7 @@
# - a test result numbered as 0 is to be considered out-of-order
# This is consistent with the behaviour of the `prove' utility.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
if $PERL -w -e '
diff --git a/tests/tap-todo-skip-together.test
b/tests/tap-todo-skip-together.test
index 0f4a943..39a0177 100755
--- a/tests/tap-todo-skip-together.test
+++ b/tests/tap-todo-skip-together.test
@@ -18,7 +18,7 @@
# - TODO and SKIP directives on the same line: the first one wins
# See also related test 'tap-ambiguous-directive.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-todo-skip-whitespace.test
b/tests/tap-todo-skip-whitespace.test
index fe32c97..12e621f 100755
--- a/tests/tap-todo-skip-whitespace.test
+++ b/tests/tap-todo-skip-whitespace.test
@@ -18,7 +18,7 @@
# - normalization of whitespace in console testsuite progress associated
# with TODO and SKIP directives
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-todo-skip.test b/tests/tap-todo-skip.test
index d00dddd..7bd894b 100755
--- a/tests/tap-todo-skip.test
+++ b/tests/tap-todo-skip.test
@@ -23,7 +23,7 @@
# - the reasons for TODO and SKIP, if present, are nicely printed in
# the testsuite progress output
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-unplanned.test b/tests/tap-unplanned.test
index 177e36e..7d131d4 100755
--- a/tests/tap-unplanned.test
+++ b/tests/tap-unplanned.test
@@ -17,7 +17,7 @@
# TAP support:
# - unplanned tests are properly reported as errors
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-whitespace-normalization.test
b/tests/tap-whitespace-normalization.test
index a902438..e44a659 100755
--- a/tests/tap-whitespace-normalization.test
+++ b/tests/tap-whitespace-normalization.test
@@ -20,7 +20,7 @@
# force us to tweak dozens of other tests (hopefully).
# See also related test 'tap-todo-skip-whitespace.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
diff --git a/tests/tap-with-and-without-number.test
b/tests/tap-with-and-without-number.test
index e989cc8..0865a6e 100755
--- a/tests/tap-with-and-without-number.test
+++ b/tests/tap-with-and-without-number.test
@@ -19,7 +19,7 @@
# - tests without explicit number get automatically numbered in the
# testsuite progress output on console
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/tap-xfail-tests.test b/tests/tap-xfail-tests.test
index 22733c8..3b98dd2 100755
--- a/tests/tap-xfail-tests.test
+++ b/tests/tap-xfail-tests.test
@@ -17,7 +17,7 @@
# TAP and $(XFAIL_TESTS): test results without directives are turned from
# PASS to XPASS and from FAIL to XFAIL; other results are unchanged.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/tests/test-driver-create-log-dir.test
b/tests/test-driver-create-log-dir.test
index c554793..902ae7c 100755
--- a/tests/test-driver-create-log-dir.test
+++ b/tests/test-driver-create-log-dir.test
@@ -18,7 +18,7 @@
# e.g., `sub/foo.log'), the Automake test harness must ensure that
# directory exists before calling any custom test driver.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-driver-custom-html.test
b/tests/test-driver-custom-html.test
index 5663ee6..e9f60d7 100755
--- a/tests/test-driver-custom-html.test
+++ b/tests/test-driver-custom-html.test
@@ -19,7 +19,7 @@
# - recheck-html
# Keep this in sync with sister test `parallel-tests2.test'.
-parallel_tests=yes
+am_parallel_tests=yes
required=rst2html
. ./defs || Exit 1
diff --git a/tests/test-driver-custom-multitest-recheck.test
b/tests/test-driver-custom-multitest-recheck.test
index 8bbcc7c..bd9e9d6 100755
--- a/tests/test-driver-custom-multitest-recheck.test
+++ b/tests/test-driver-custom-multitest-recheck.test
@@ -22,7 +22,7 @@
# and `parallel-tests-recheck-override.test'.
# Keep in sync with 'tap-recheck.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cp "$testsrcdir"/trivial-test-driver . \
diff --git a/tests/test-driver-custom-multitest-recheck2.test
b/tests/test-driver-custom-multitest-recheck2.test
index 0d254dc..9f43b77 100755
--- a/tests/test-driver-custom-multitest-recheck2.test
+++ b/tests/test-driver-custom-multitest-recheck2.test
@@ -21,7 +21,7 @@
# See also related tests `test-driver-custom-multitest-recheck.test' and
# `parallel-tests-recheck-override.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cp "$testsrcdir"/trivial-test-driver . \
diff --git a/tests/test-driver-custom-multitest.test
b/tests/test-driver-custom-multitest.test
index da15597..1380ea7 100755
--- a/tests/test-driver-custom-multitest.test
+++ b/tests/test-driver-custom-multitest.test
@@ -19,7 +19,7 @@
# only checks implementation details in Automake's custom test drivers
# support, but also serves as a "usability test" for our APIs.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cp "$testsrcdir"/trivial-test-driver . \
diff --git a/tests/test-driver-custom-no-extra-driver.test
b/tests/test-driver-custom-no-extra-driver.test
index 28c9a19..1196e77 100755
--- a/tests/test-driver-custom-no-extra-driver.test
+++ b/tests/test-driver-custom-no-extra-driver.test
@@ -18,7 +18,7 @@
# installed or referenced if it's not used, i.e., if the user has
# defined his own `*LOG_DRIVER' variables.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<'END'
diff --git a/tests/test-driver-custom-no-html.test
b/tests/test-driver-custom-no-html.test
index 37b93bc..970cf62 100755
--- a/tests/test-driver-custom-no-html.test
+++ b/tests/test-driver-custom-no-html.test
@@ -19,7 +19,7 @@
# for drivers that are not interested to support the .log -> HTML
# conversion offered by Automake.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-driver-custom-xfail-tests.test
b/tests/test-driver-custom-xfail-tests.test
index e68e04b..3c46237 100755
--- a/tests/test-driver-custom-xfail-tests.test
+++ b/tests/test-driver-custom-xfail-tests.test
@@ -16,7 +16,7 @@
# Custom test drivers: "abstract" XFAIL_TESTS support.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<'END'
diff --git a/tests/test-driver-custom.test b/tests/test-driver-custom.test
index 8305047..a6f8deb 100755
--- a/tests/test-driver-custom.test
+++ b/tests/test-driver-custom.test
@@ -16,7 +16,7 @@
# Custom test drivers: per-extension test drivers.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-driver-fail.test b/tests/test-driver-fail.test
index e1d2f9c..fdc7251 100755
--- a/tests/test-driver-fail.test
+++ b/tests/test-driver-fail.test
@@ -22,7 +22,7 @@
# (like our dummy one in this test) might leave around a test log even
# in case of internal failures.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<'END'
diff --git a/tests/test-driver-strip-vpath.test
b/tests/test-driver-strip-vpath.test
index 7187abb..3ba34ff 100755
--- a/tests/test-driver-strip-vpath.test
+++ b/tests/test-driver-strip-vpath.test
@@ -17,7 +17,7 @@
# Custom test drivers: check that the test name passed to the test
# driver has any VPATH prefix stripped.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
ocwd=`pwd` || fatal_ "cannot get current working directory"
diff --git a/tests/test-driver-trs-suffix-registered.test
b/tests/test-driver-trs-suffix-registered.test
index 7f6522a..4a5b195 100755
--- a/tests/test-driver-trs-suffix-registered.test
+++ b/tests/test-driver-trs-suffix-registered.test
@@ -20,7 +20,7 @@
# - .test if $(TEST_EXTENSIONS) is not defined
# - stuff in $(TEST_EXTENSIONS) otherwise
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
: > Makefile.am
diff --git a/tests/test-harness-vpath-rewrite.test
b/tests/test-harness-vpath-rewrite.test
index f19506c..9d61064 100755
--- a/tests/test-harness-vpath-rewrite.test
+++ b/tests/test-harness-vpath-rewrite.test
@@ -17,7 +17,7 @@
# Check that our concurrent test harness is not subject to spurious VPATH
# rewrites.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-log.test b/tests/test-log.test
index c25cb20..c83e20f 100755
--- a/tests/test-log.test
+++ b/tests/test-log.test
@@ -22,7 +22,7 @@
# - VERBOSE environment variable support
# Keep in sync with 'tap-log.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<END
diff --git a/tests/test-logs-repeated.test b/tests/test-logs-repeated.test
old mode 100644
new mode 100755
index 94dd7c8..5ab3461
--- a/tests/test-logs-repeated.test
+++ b/tests/test-logs-repeated.test
@@ -20,7 +20,7 @@
# different test scripts don't end up sharing the same log file.
# (Automake itself is such a project, BTW ;-)
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<END
diff --git a/tests/test-metadata-global-log.test
b/tests/test-metadata-global-log.test
index a6f0999..ab43802 100755
--- a/tests/test-metadata-global-log.test
+++ b/tests/test-metadata-global-log.test
@@ -20,7 +20,7 @@
# with the use of the reStructuredText field `:copy-in-global-log:' in
# the associated `.trs' files.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-metadata-global-result.test
b/tests/test-metadata-global-result.test
index d20b249..f524328 100755
--- a/tests/test-metadata-global-result.test
+++ b/tests/test-metadata-global-result.test
@@ -18,7 +18,7 @@
# "global test result" in `*.trs' files, as documented in the automake
# manual.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-metadata-recheck.test b/tests/test-metadata-recheck.test
index 6a372f3..f3a3ef5 100755
--- a/tests/test-metadata-recheck.test
+++ b/tests/test-metadata-recheck.test
@@ -17,7 +17,7 @@
# Test the "make recheck" semantics for custom test drivers, as documented
# in the Automake manual.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-metadata-results.test b/tests/test-metadata-results.test
index 923f88f..11feea7 100755
--- a/tests/test-metadata-results.test
+++ b/tests/test-metadata-results.test
@@ -17,7 +17,7 @@
# Parallel testsuite harness: check APIs for the registering of test
# results in `*.trs' files, as documented in the automake manual.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-missing.test b/tests/test-missing.test
index a4ac179..4e9f286 100755
--- a/tests/test-missing.test
+++ b/tests/test-missing.test
@@ -18,7 +18,7 @@
# - non-existent scripts listed in TESTS get diagnosed
# See also related test 'test-missing2.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-missing2.test b/tests/test-missing2.test
index bc2979a..25d5173 100755
--- a/tests/test-missing2.test
+++ b/tests/test-missing2.test
@@ -19,7 +19,7 @@
# all the $(TEST_LOGS) have a dummy dependency.
# See also related test 'test-missing.test'.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/test-trs-basic.test b/tests/test-trs-basic.test
index 8a8c3c8..b615b18 100755
--- a/tests/test-trs-basic.test
+++ b/tests/test-trs-basic.test
@@ -18,7 +18,7 @@
# - creation and removal of `.trs' auxiliary files
# - check some internals regarding the use of `.trs' files.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<END
diff --git a/tests/test-trs-recover.test b/tests/test-trs-recover.test
index 9893424..fe12a4e 100755
--- a/tests/test-trs-recover.test
+++ b/tests/test-trs-recover.test
@@ -19,7 +19,7 @@
# This test is complex and tricky, but that's acceptable since we are
# testing semantics that are potentially complex and tricky.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<END
diff --git a/tests/test-trs-recover2.test b/tests/test-trs-recover2.test
index bc94b3b..fb9f924 100755
--- a/tests/test-trs-recover2.test
+++ b/tests/test-trs-recover2.test
@@ -17,7 +17,7 @@
# Check parallel harness features:
# - recovery from unreadable `.trs' files, in various scenarios
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in <<END
diff --git a/tests/tests-environment-and-log-compiler.test
b/tests/tests-environment-and-log-compiler.test
index eafc3bf..c639355 100755
--- a/tests/tests-environment-and-log-compiler.test
+++ b/tests/tests-environment-and-log-compiler.test
@@ -18,7 +18,7 @@
# by TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER and
# LOG_FLAGS (for tests both with and without registered extensions).
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/tests-environment-backcompat.test
b/tests/tests-environment-backcompat.test
index 9578ca5..36cc642 100755
--- a/tests/tests-environment-backcompat.test
+++ b/tests/tests-environment-backcompat.test
@@ -19,7 +19,7 @@
# be run by (with the parallel-tests driver one should use LOG_COMPILER
# for this). The behaviour tested here is also documented in the manual.
-parallel_tests=no
+am_parallel_tests=no
. ./defs || Exit 1
cat >> configure.in <<END
diff --git a/tests/tests-environment-fd-redirect.test
b/tests/tests-environment-fd-redirect.test
index b2b5ab4..855e342 100755
--- a/tests/tests-environment-fd-redirect.test
+++ b/tests/tests-environment-fd-redirect.test
@@ -26,7 +26,7 @@
# and the following CC:ed thread on bug-autoconf list:
# <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/testsuite-summary-checks.sh
b/tests/testsuite-summary-checks.sh
index a4de864..2a5685b 100755
--- a/tests/testsuite-summary-checks.sh
+++ b/tests/testsuite-summary-checks.sh
@@ -20,7 +20,7 @@
# testsuite output, packages with and without bug-report addresses,
# testsuites in subdirectories, ...)
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
case $use_colors in
diff --git a/tests/testsuite-summary-count-many.test
b/tests/testsuite-summary-count-many.test
index b0232c7..2621b29 100755
--- a/tests/testsuite-summary-count-many.test
+++ b/tests/testsuite-summary-count-many.test
@@ -19,7 +19,7 @@
# Incidentally, this test also checks that the testsuite summary doesn't
# give any bug-report address if it's not defined.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
for s in trivial-test-driver extract-testsuite-summary; do
diff --git a/tests/testsuite-summary-reference-log.test
b/tests/testsuite-summary-reference-log.test
index 7558b5f..eb21f8c 100755
--- a/tests/testsuite-summary-reference-log.test
+++ b/tests/testsuite-summary-reference-log.test
@@ -17,7 +17,7 @@
# Check that the global testsuite log file referenced in the testsuite
# summary and in the global testsuite log itself is correct.
-parallel_tests=yes
+am_parallel_tests=yes
. ./defs || Exit 1
mv configure.in configure.stub
diff --git a/tests/warning-groups-win-over-strictness.test
b/tests/warning-groups-win-over-strictness.test
index a291442..7e3f526 100755
--- a/tests/warning-groups-win-over-strictness.test
+++ b/tests/warning-groups-win-over-strictness.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
# We want complete control over automake options.
-AUTOMAKE=$original_AUTOMAKE
+AUTOMAKE=$am_original_AUTOMAKE
# Files required in gnu and/or gnits strictness.
touch README INSTALL NEWS AUTHORS ChangeLog COPYING THANKS
diff --git a/tests/warnings-override.test b/tests/warnings-override.test
index 728a7c0..aa7da67 100755
--- a/tests/warnings-override.test
+++ b/tests/warnings-override.test
@@ -24,7 +24,7 @@
. ./defs || Exit 1
# We want (almost) complete control over automake options.
-AUTOMAKE="$original_AUTOMAKE -Werror"
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
cat > Makefile.am <<'END'
FOO := bar
diff --git a/tests/warnings-precedence.test b/tests/warnings-precedence.test
index 0f11669..f191c1a 100755
--- a/tests/warnings-precedence.test
+++ b/tests/warnings-precedence.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
# We want (almost) complete control over automake options.
-AUTOMAKE="$original_AUTOMAKE -Werror"
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
cat > Makefile.am <<'END'
FOO := bar
diff --git a/tests/warnings-strictness-interactions.test
b/tests/warnings-strictness-interactions.test
index e2c7675..85669d7 100755
--- a/tests/warnings-strictness-interactions.test
+++ b/tests/warnings-strictness-interactions.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
# We want (almost) complete control over automake options.
-AUTOMAKE="$original_AUTOMAKE -Werror"
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
cat > Makefile.am <<END
AUTOMAKE_OPTIONS =
diff --git a/tests/warnings-unknown.test b/tests/warnings-unknown.test
index db803a5..f1fa23e 100755
--- a/tests/warnings-unknown.test
+++ b/tests/warnings-unknown.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
# We want (almost) complete control over automake options.
-AUTOMAKE="$original_AUTOMAKE --foreign -Werror"
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
cat > configure.in <<END
AC_INIT([$me], [1.0])
diff --git a/tests/warnings-win-over-strictness.test
b/tests/warnings-win-over-strictness.test
index 83fced7..a577dfe 100755
--- a/tests/warnings-win-over-strictness.test
+++ b/tests/warnings-win-over-strictness.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
# We want complete control over automake options.
-AUTOMAKE=$original_AUTOMAKE
+AUTOMAKE=$am_original_AUTOMAKE
ok ()
{
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1335-gefdc3e1,
Stefano Lattarini <=