* tests/defs-static.in ($am_testauxdir): New variable.
* tests/testsuite-summary-checks.sh: Moved ...
* tests/ax/testsuite-summary-checks.sh: ... here.
* tests/trivial-test-driver: Moved ...
* tests/ax/trivial-test-driver: ... here.
* tests/tap-summary-aux.sh: Moved ...
* tests/ax/tap-summary-aux.sh: ... here.
* tests/distcheck-hook-m4.am: Moved ...
* tests/ax/distcheck-hook-m4.am: ... here.
* tests/prove-runner: Moved ...
* tests/ax/prove-runner: ... here.
* tests/depcomp.sh: Moved ...
* tests/ax/depcomp.sh: ... here.
* tests/tap-setup.sh: Moved ...
* tests/ax/tap-setup.sh: ... here.
* tests/tap-functions.sh: Moved ...
* tests/ax/tap-functions.sh: ... here.
* tests/plain-functions.sh: Moved ...
* tests/ax/plain-functions.sh: ... here.
* tests/extract-testsuite-summary: Moved ...
* tests/ax/extract-testsuite-summary.pl: .. . here.
* tests/gen-testsuite-part: Adjusted accordingly.
* tests/Makefile.am: Likewise.
* tests/defs: Likewise.
* syntax-check.mk: Likewise.
* Several tests: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>
---
syntax-checks.mk | 1 +
tests/Makefile.am | 15 ++++++++-------
tests/{ => ax}/depcomp.sh | 0
tests/{ => ax}/distcheck-hook-m4.am | 0
.../extract-testsuite-summary.pl} | 0
tests/{ => ax}/plain-functions.sh | 0
tests/{ => ax}/prove-runner | 0
tests/{ => ax}/tap-functions.sh | 0
tests/{ => ax}/tap-setup.sh | 0
tests/{ => ax}/tap-summary-aux.sh | 2 +-
tests/{ => ax}/testsuite-summary-checks.sh | 2 +-
tests/{ => ax}/trivial-test-driver | 0
tests/defs | 6 +++---
tests/defs-static.in | 4 ++++
tests/distcheck-missing-m4.test | 2 +-
tests/distcheck-outdated-m4.test | 2 +-
tests/gen-testsuite-part | 20 ++++++++++++--------
tests/tap-ambiguous-directive.test | 2 +-
tests/tap-autonumber.test | 2 +-
tests/tap-bailout-and-logging.test | 2 +-
tests/tap-bailout-leading-space.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-color.test | 2 +-
tests/tap-deps.test | 2 +-
tests/tap-diagnostic.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-log.test | 2 +-
tests/tap-merge-stdout-stderr.test | 2 +-
tests/tap-missing-plan-and-bad-exit.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-result-comment.test | 2 +-
tests/tap-summary-color.test | 2 +-
tests/tap-summary.test | 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-acsubst.test | 2 +-
tests/test-driver-cond.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/testsuite-summary-color.test | 2 +-
tests/testsuite-summary-count-many.test | 6 +++---
tests/testsuite-summary-count.test | 2 +-
96 files changed, 113 insertions(+), 103 deletions(-)
rename tests/{ => ax}/depcomp.sh (100%)
mode change 100755 => 100644
rename tests/{ => ax}/distcheck-hook-m4.am (100%)
rename tests/{extract-testsuite-summary => ax/extract-testsuite-summary.pl}
(100%)
rename tests/{ => ax}/plain-functions.sh (100%)
rename tests/{ => ax}/prove-runner (100%)
rename tests/{ => ax}/tap-functions.sh (100%)
rename tests/{ => ax}/tap-setup.sh (100%)
mode change 100755 => 100644
rename tests/{ => ax}/tap-summary-aux.sh (98%)
mode change 100755 => 100644
rename tests/{ => ax}/testsuite-summary-checks.sh (97%)
mode change 100755 => 100644
rename tests/{ => ax}/trivial-test-driver (100%)
diff --git a/syntax-checks.mk b/syntax-checks.mk
index d9d0c4d..79f285f 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -29,6 +29,7 @@ xtests := $(shell \
for s in test tap sh; do \
ls $$d/tests/*.$$s 2>/dev/null; \
done; \
+ ls $$d/tests/ax/*.sh 2>/dev/null; \
done | sort)
ams := $(shell find $(srcdir) -name '*.am')
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 864bd24..8ebd31b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -84,12 +84,13 @@ $(generated_TESTS) $(srcdir)/testsuite-part.am: \
# Static dependencies valid for each test case.
check_SCRIPTS = wrap/aclocal-$(APIVERSION) wrap/automake-$(APIVERSION)
-check_DATA = defs defs-static plain-functions.sh tap-functions.sh
-EXTRA_DIST += tap-functions.sh plain-functions.sh
+check_DATA = defs defs-static
+dist_check_DATA = ax/plain-functions.sh ax/tap-functions.sh
# Few more static dependencies.
-distcheck-missing-m4.log distcheck-outdated-m4.log: distcheck-hook-m4.am
-EXTRA_DIST += distcheck-hook-m4.am
+distcheck-missing-m4.log: ax/distcheck-hook-m4.am
+distcheck-outdated-m4.log: ax/distcheck-hook-m4.am
+EXTRA_DIST += ax/distcheck-hook-m4.am
# Keep in sync with AC_SUBST'd stuff in defs-static.in.
do_subst = sed \
@@ -202,14 +203,14 @@ AM_PROVECMD = \
test -z "$$tests" || \
{ \
$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
- $(PROVE) $(AM_PROVEFLAGS) -e $(srcdir)/prove-runner $(PROVEFLAGS) \
+ $(PROVE) $(AM_PROVEFLAGS) -e $(srcdir)/ax/prove-runner $(PROVEFLAGS) \
$$tests $(AM_TESTS_FD_REDIRECT); \
}
-EXTRA_DIST += prove-runner
+EXTRA_DIST += ax/prove-runner
.PHONY: prove installprove
-prove installprove: $(TESTS) prove-runner defs-static
+prove installprove: $(TESTS) ax/prove-runner defs-static
@exit_status=0; \
## The testsuite can be run either using the automake build tree or
## the already-installed automake package.
diff --git a/tests/depcomp.sh b/tests/ax/depcomp.sh
old mode 100755
new mode 100644
similarity index 100%
rename from tests/depcomp.sh
rename to tests/ax/depcomp.sh
diff --git a/tests/distcheck-hook-m4.am b/tests/ax/distcheck-hook-m4.am
similarity index 100%
rename from tests/distcheck-hook-m4.am
rename to tests/ax/distcheck-hook-m4.am
diff --git a/tests/extract-testsuite-summary
b/tests/ax/extract-testsuite-summary.pl
similarity index 100%
rename from tests/extract-testsuite-summary
rename to tests/ax/extract-testsuite-summary.pl
diff --git a/tests/plain-functions.sh b/tests/ax/plain-functions.sh
similarity index 100%
rename from tests/plain-functions.sh
rename to tests/ax/plain-functions.sh
diff --git a/tests/prove-runner b/tests/ax/prove-runner
similarity index 100%
rename from tests/prove-runner
rename to tests/ax/prove-runner
diff --git a/tests/tap-functions.sh b/tests/ax/tap-functions.sh
similarity index 100%
rename from tests/tap-functions.sh
rename to tests/ax/tap-functions.sh
diff --git a/tests/tap-setup.sh b/tests/ax/tap-setup.sh
old mode 100755
new mode 100644
similarity index 100%
rename from tests/tap-setup.sh
rename to tests/ax/tap-setup.sh
diff --git a/tests/tap-summary-aux.sh b/tests/ax/tap-summary-aux.sh
old mode 100755
new mode 100644
similarity index 98%
rename from tests/tap-summary-aux.sh
rename to tests/ax/tap-summary-aux.sh
index 022d1d7..6965281
--- a/tests/tap-summary-aux.sh
+++ b/tests/ax/tap-summary-aux.sh
@@ -67,7 +67,7 @@ do_check ()
else
test $st -eq 0 || Exit 1
fi
- $PERL -w "$testsrcdir"/extract-testsuite-summary stdout > summary.got \
+ $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
|| fatal_ "cannot extract testsuite summary"
cat summary.exp
cat summary.got
diff --git a/tests/testsuite-summary-checks.sh
b/tests/ax/testsuite-summary-checks.sh
old mode 100755
new mode 100644
similarity index 97%
rename from tests/testsuite-summary-checks.sh
rename to tests/ax/testsuite-summary-checks.sh
index e126bd5..309d473
--- a/tests/testsuite-summary-checks.sh
+++ b/tests/ax/testsuite-summary-checks.sh
@@ -84,7 +84,7 @@ do_check ()
else
test $st -eq 0 || Exit 1
fi
- $PERL -w "$testsrcdir"/extract-testsuite-summary stdout > summary.got \
+ $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
|| fatal_ "cannot extract testsuite summary"
cat summary.exp
cat summary.got
diff --git a/tests/trivial-test-driver b/tests/ax/trivial-test-driver
similarity index 100%
rename from tests/trivial-test-driver
rename to tests/ax/trivial-test-driver
diff --git a/tests/defs b/tests/defs
index 447c89e..709101e 100644
--- a/tests/defs
+++ b/tests/defs
@@ -217,13 +217,13 @@ else
am_funcs_file=plain-functions.sh
fi
-if test -f "$testsrcdir/$am_funcs_file"; then
- . "$testsrcdir/$am_funcs_file" || {
+if test -f "$am_testauxdir/$am_funcs_file"; then
+ . "$am_testauxdir/$am_funcs_file" || {
echo "$me: error sourcing $testsrcdir/$am_funcs_file" >&2
Exit 99
}
else
- echo "$me: $testsrcdir/$am_funcs_file not found, check \$testsrcdir" >&2
+ echo "$me: $am_testauxdir/$am_funcs_file not found" >&2
Exit 99
fi
unset am_funcs_file
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 1ada923..c1500cd 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -100,6 +100,10 @@ testbuilddir='@abs_builddir@'
top_testbuilddir='@abs_top_builddir@'
testprefix='@prefix@'
+# Where testsuite-related helper scripts, data files and shell libraries
+# are placed.
+am_testauxdir=$testsrcdir/ax
+
# Support for the "installcheck" target.
case ${am_running_installcheck:=no} in
yes)
diff --git a/tests/distcheck-missing-m4.test b/tests/distcheck-missing-m4.test
index 37fcc26..e583be1 100755
--- a/tests/distcheck-missing-m4.test
+++ b/tests/distcheck-missing-m4.test
@@ -22,7 +22,7 @@
cwd=`pwd` || fatal_ "cannot get current working directory"
-cp "$testsrcdir"/distcheck-hook-m4.am . \
+cp "$am_testauxdir"/distcheck-hook-m4.am . \
|| fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
cat > Makefile.am << 'END'
diff --git a/tests/distcheck-outdated-m4.test b/tests/distcheck-outdated-m4.test
index e80ff53..71ae3dd 100755
--- a/tests/distcheck-outdated-m4.test
+++ b/tests/distcheck-outdated-m4.test
@@ -22,7 +22,7 @@
cwd=`pwd` || fatal_ "cannot get current working directory"
-cp "$testsrcdir"/distcheck-hook-m4.am . \
+cp "$am_testauxdir"/distcheck-hook-m4.am . \
|| fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
cat > Makefile.am << 'END'
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index 42262f7..719dc17 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -137,6 +137,10 @@ sub parse_options (@)
#--------------------------------------------------------------------------
+# Where testsuite-related helper scripts, data files and shell libraries
+# are placed. Relative to the 'tests/' subdirectory.
+my $auxdir = "ax";
+
my %deps_extractor =
(
libtool_macros =>
@@ -152,33 +156,33 @@ my %deps_extractor =
use_trivial_test_driver =>
{
line_matcher => qr/\btrivial-test-driver\b/,
- dist_prereqs => "trivial-test-driver",
+ dist_prereqs => "$auxdir/trivial-test-driver",
},
check_testsuite_summary =>
{
line_matcher => qr/\btestsuite-summary-checks\.sh\b/,
- dist_prereqs => "testsuite-summary-checks.sh",
+ dist_prereqs => "$auxdir/testsuite-summary-checks.sh",
},
extract_testsuite_summary =>
{
- line_matcher => qr/\bextract-testsuite-summary\b/,
- dist_prereqs => "extract-testsuite-summary",
+ line_matcher => qr/\bextract-testsuite-summary\.pl\b/,
+ dist_prereqs => "$auxdir/extract-testsuite-summary.pl",
},
check_tap_testsuite_summary =>
{
line_matcher => qr/\btap-summary-aux\.sh\b/,
- dist_prereqs => "tap-summary-aux.sh",
+ dist_prereqs => "$auxdir/tap-summary-aux.sh",
},
on_tap_with_common_setup =>
{
line_matcher => qr/\btap-setup\.sh\b/,
- dist_prereqs => "tap-setup.sh",
+ dist_prereqs => "$auxdir/tap-setup.sh",
nodist_prereqs => "tap-common-setup.log",
},
depcomp =>
{
line_matcher => qr/\bdepcomp\.sh\b/,
- dist_prereqs => "depcomp.sh",
+ dist_prereqs => "$auxdir/depcomp.sh",
},
);
@@ -366,7 +370,7 @@ foreach my $lt (TRUE, FALSE)
required="@required"
. ./defs || Exit 1
plan_ $planned
- . "\$testsrcdir/depcomp.sh"; exit "\$?"
+ . "\$am_testauxdir/depcomp.sh"; exit "\$?"
EOF
},
0555);
diff --git a/tests/tap-ambiguous-directive.test
b/tests/tap-ambiguous-directive.test
index 68ed990..32b1b80 100755
--- a/tests/tap-ambiguous-directive.test
+++ b/tests/tap-ambiguous-directive.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..6
diff --git a/tests/tap-autonumber.test b/tests/tap-autonumber.test
index 8799fde..4e88f3d 100755
--- a/tests/tap-autonumber.test
+++ b/tests/tap-autonumber.test
@@ -23,7 +23,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..14
diff --git a/tests/tap-bailout-and-logging.test
b/tests/tap-bailout-and-logging.test
index 8019caa..cc95d98 100755
--- a/tests/tap-bailout-and-logging.test
+++ b/tests/tap-bailout-and-logging.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
First line
diff --git a/tests/tap-bailout-leading-space.test
b/tests/tap-bailout-leading-space.test
index cca50f9..94084d4 100755
--- a/tests/tap-bailout-leading-space.test
+++ b/tests/tap-bailout-leading-space.test
@@ -24,7 +24,7 @@ am_parallel_tests=yes
am_tap_implementation=shell
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..1
diff --git a/tests/tap-bailout-suppress-badexit.test
b/tests/tap-bailout-suppress-badexit.test
index b8d6554..1962639 100755
--- a/tests/tap-bailout-suppress-badexit.test
+++ b/tests/tap-bailout-suppress-badexit.test
@@ -27,7 +27,7 @@ cat > Makefile.am <<END
TESTS = $tests
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > exit.test << 'END'
#!/bin/sh
diff --git a/tests/tap-bailout-suppress-later-diagnostic.test
b/tests/tap-bailout-suppress-later-diagnostic.test
index 965eb3a..9bc29de 100755
--- a/tests/tap-bailout-suppress-later-diagnostic.test
+++ b/tests/tap-bailout-suppress-later-diagnostic.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo AM_TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
diff --git a/tests/tap-bailout-suppress-later-errors.test
b/tests/tap-bailout-suppress-later-errors.test
index 6a13b64..e6cc6c2 100755
--- a/tests/tap-bailout-suppress-later-errors.test
+++ b/tests/tap-bailout-suppress-later-errors.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Various errors that can all be squashed into a single test script.
cat > foo.test << 'END'
diff --git a/tests/tap-bailout.test b/tests/tap-bailout.test
index 7f10d0d..0def87e 100755
--- a/tests/tap-bailout.test
+++ b/tests/tap-bailout.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
: > exp
diff --git a/tests/tap-color.test b/tests/tap-color.test
index edc795c..b8c4004 100755
--- a/tests/tap-color.test
+++ b/tests/tap-color.test
@@ -47,7 +47,7 @@ TESTS = all.test skip.test bail.test badplan.test noplan.test
\
few.test many.test order.test afterlate.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..5
diff --git a/tests/tap-deps.test b/tests/tap-deps.test
index 7510243..5049171 100755
--- a/tests/tap-deps.test
+++ b/tests/tap-deps.test
@@ -27,7 +27,7 @@ b.log: a.log
c.log: b.log
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test << 'END'
#!/bin/sh
diff --git a/tests/tap-diagnostic.test b/tests/tap-diagnostic.test
index 24f88fb..31f5df6 100755
--- a/tests/tap-diagnostic.test
+++ b/tests/tap-diagnostic.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
metacharacters=\''"\$!&()[]<>#;^?*'
diff --git a/tests/tap-empty-diagnostic.test b/tests/tap-empty-diagnostic.test
index 9ddd115..1a8a99b 100755
--- a/tests/tap-empty-diagnostic.test
+++ b/tests/tap-empty-diagnostic.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
sed 's/\$$//' > all.test <<END
1..1$
diff --git a/tests/tap-empty.test b/tests/tap-empty.test
index 52ad93c..4d3bfda 100755
--- a/tests/tap-empty.test
+++ b/tests/tap-empty.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Empty TAP input.
: > empty.test
diff --git a/tests/tap-escape-directive-2.test
b/tests/tap-escape-directive-2.test
index 087a72e..595c384 100755
--- a/tests/tap-escape-directive-2.test
+++ b/tests/tap-escape-directive-2.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..8
diff --git a/tests/tap-escape-directive.test b/tests/tap-escape-directive.test
index 5e0c1b4..8b24251 100755
--- a/tests/tap-escape-directive.test
+++ b/tests/tap-escape-directive.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..2
diff --git a/tests/tap-exit.test b/tests/tap-exit.test
index 236e92d..abc1ace 100755
--- a/tests/tap-exit.test
+++ b/tests/tap-exit.test
@@ -35,7 +35,7 @@ done
chmod a+x *.test
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
$MAKE check >stdout && { cat stdout; Exit 1; }
cat stdout
diff --git a/tests/tap-fancy.test b/tests/tap-fancy.test
index 00d973e..6815ac5 100755
--- a/tests/tap-fancy.test
+++ b/tests/tap-fancy.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
#
# From manpage Test::Harness::TAP(3):
diff --git a/tests/tap-fancy2.test b/tests/tap-fancy2.test
index 9f26a95..bb51d54 100755
--- a/tests/tap-fancy2.test
+++ b/tests/tap-fancy2.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
#
# From manpage Test::Harness::TAP(3):
diff --git a/tests/tap-global-log.test b/tests/tap-global-log.test
index c98ad65..69dc5b0 100755
--- a/tests/tap-global-log.test
+++ b/tests/tap-global-log.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > ok.test << 'END'
1..5
diff --git a/tests/tap-global-result.test b/tests/tap-global-result.test
index f4e6f46..78d5c9f 100755
--- a/tests/tap-global-result.test
+++ b/tests/tap-global-result.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > ok.test <<END
1..3
diff --git a/tests/tap-log.test b/tests/tap-log.test
index 4278f55..ca564e1 100755
--- a/tests/tap-log.test
+++ b/tests/tap-log.test
@@ -30,7 +30,7 @@ TESTS = pass.test skip.test xfail.test fail.test xpass.test
error.test
TEST_SUITE_LOG = global.log
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Custom markers, for use in grepping checks.
cmarker=::: # comment marker
diff --git a/tests/tap-merge-stdout-stderr.test
b/tests/tap-merge-stdout-stderr.test
index ce27a80..351b10d 100755
--- a/tests/tap-merge-stdout-stderr.test
+++ b/tests/tap-merge-stdout-stderr.test
@@ -28,7 +28,7 @@ AM_TEST_LOG_DRIVER_FLAGS = --comments --merge
TESTS = all.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
#!/bin/sh
diff --git a/tests/tap-missing-plan-and-bad-exit.test
b/tests/tap-missing-plan-and-bad-exit.test
index 796b4b0..e1ea4fd 100755
--- a/tests/tap-missing-plan-and-bad-exit.test
+++ b/tests/tap-missing-plan-and-bad-exit.test
@@ -31,7 +31,7 @@ echo TESTS = foo.test > Makefile.am
chmod a+x foo.test
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
$MAKE check >stdout && { cat stdout; Exit 1; }
cat stdout
diff --git a/tests/tap-msg0-bailout.test b/tests/tap-msg0-bailout.test
index 2d9827e..115ffcd 100755
--- a/tests/tap-msg0-bailout.test
+++ b/tests/tap-msg0-bailout.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo 'Bail out! 0' > a.test
echo 'Bail out! 0.0' > b.test
diff --git a/tests/tap-msg0-directive.test b/tests/tap-msg0-directive.test
index 8ca5b1c..04d3790 100755
--- a/tests/tap-msg0-directive.test
+++ b/tests/tap-msg0-directive.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..3
diff --git a/tests/tap-msg0-misc.test b/tests/tap-msg0-misc.test
index d6323ad..6a515a8 100755
--- a/tests/tap-msg0-misc.test
+++ b/tests/tap-msg0-misc.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..14
diff --git a/tests/tap-msg0-planskip.test b/tests/tap-msg0-planskip.test
index 58b89cc..60aa5fe 100755
--- a/tests/tap-msg0-planskip.test
+++ b/tests/tap-msg0-planskip.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo '1..0 # SKIP 0' > a.test
echo '1..0 # SKIP 0.0' > b.test
diff --git a/tests/tap-msg0-result.test b/tests/tap-msg0-result.test
index 31e49cd..8c464c4 100755
--- a/tests/tap-msg0-result.test
+++ b/tests/tap-msg0-result.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..10
diff --git a/tests/tap-negative-numbers.test b/tests/tap-negative-numbers.test
index 80db0b4..67ecb1e 100755
--- a/tests/tap-negative-numbers.test
+++ b/tests/tap-negative-numbers.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..7
diff --git a/tests/tap-no-disable-hard-error.test
b/tests/tap-no-disable-hard-error.test
index 5b2d00f..c95e20e 100755
--- a/tests/tap-no-disable-hard-error.test
+++ b/tests/tap-no-disable-hard-error.test
@@ -27,7 +27,7 @@ TEST_LOG_COMPILER = cat
TESTS = bail.test few.test noplan.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > bail.test <<END
1..1
diff --git a/tests/tap-no-merge-stdout-stderr.test
b/tests/tap-no-merge-stdout-stderr.test
index 4cc260a..0236ef8 100755
--- a/tests/tap-no-merge-stdout-stderr.test
+++ b/tests/tap-no-merge-stdout-stderr.test
@@ -26,7 +26,7 @@ TEST_LOG_DRIVER_FLAGS = --comments
TESTS = all.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
#!/bin/sh
diff --git a/tests/tap-no-spurious-numbers.test
b/tests/tap-no-spurious-numbers.test
index 24c6d09..2fc993e 100755
--- a/tests/tap-no-spurious-numbers.test
+++ b/tests/tap-no-spurious-numbers.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > prefixes <<'END'
A
diff --git a/tests/tap-no-spurious-summary.test
b/tests/tap-no-spurious-summary.test
index 3b69bf9..8da15e8 100755
--- a/tests/tap-no-spurious-summary.test
+++ b/tests/tap-no-spurious-summary.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..1
diff --git a/tests/tap-no-spurious.test b/tests/tap-no-spurious.test
index 7cd1880..ac6e668 100755
--- a/tests/tap-no-spurious.test
+++ b/tests/tap-no-spurious.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo 1..5 > all.test
diff --git a/tests/tap-not-ok-skip.test b/tests/tap-not-ok-skip.test
index 2574f21..8cfffe2 100755
--- a/tests/tap-not-ok-skip.test
+++ b/tests/tap-not-ok-skip.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..4
diff --git a/tests/tap-number-wordboundary.test
b/tests/tap-number-wordboundary.test
index e8d97e7..7aa2c7f 100755
--- a/tests/tap-number-wordboundary.test
+++ b/tests/tap-number-wordboundary.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..5
diff --git a/tests/tap-numbers-leading-zero.test
b/tests/tap-numbers-leading-zero.test
index e288270..345b31f 100755
--- a/tests/tap-numbers-leading-zero.test
+++ b/tests/tap-numbers-leading-zero.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
do_checks ()
{
diff --git a/tests/tap-numeric-description.test
b/tests/tap-numeric-description.test
index 3691e8e..b2f54f3 100755
--- a/tests/tap-numeric-description.test
+++ b/tests/tap-numeric-description.test
@@ -19,7 +19,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Some random numbers to be used as test names. The definitions below are
# selected so that $x<n> != <n> for every n >= 1. We can't use positional
diff --git a/tests/tap-out-of-order.test b/tests/tap-out-of-order.test
index 5e633b5..d9f36a2 100755
--- a/tests/tap-out-of-order.test
+++ b/tests/tap-out-of-order.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..3
diff --git a/tests/tap-passthrough-exit.test b/tests/tap-passthrough-exit.test
index aadeed6..75ce5f1 100755
--- a/tests/tap-passthrough-exit.test
+++ b/tests/tap-passthrough-exit.test
@@ -39,7 +39,7 @@ END
echo TESTS += exit-$e.test >> Makefile.am
done
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
st=0
$MAKE check || st=$?
diff --git a/tests/tap-passthrough.test b/tests/tap-passthrough.test
index 6f26eb6..da05b1b 100755
--- a/tests/tap-passthrough.test
+++ b/tests/tap-passthrough.test
@@ -25,7 +25,7 @@ am_parallel_tests=yes
weirdchars=\''"\$@!&()[]<>#;,:.^?*/'
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
#
# Only successful tests.
diff --git a/tests/tap-plan-corner.test b/tests/tap-plan-corner.test
index 9b0b34c..3b9cd1f 100755
--- a/tests/tap-plan-corner.test
+++ b/tests/tap-plan-corner.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# -------------------------------------------------------------------------
diff --git a/tests/tap-plan-errors.test b/tests/tap-plan-errors.test
index f38868b..1b74059 100755
--- a/tests/tap-plan-errors.test
+++ b/tests/tap-plan-errors.test
@@ -26,7 +26,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
my_check ()
{
diff --git a/tests/tap-plan-leading-zero.test b/tests/tap-plan-leading-zero.test
index e49fb76..bb45f31 100755
--- a/tests/tap-plan-leading-zero.test
+++ b/tests/tap-plan-leading-zero.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..01
diff --git a/tests/tap-plan-malformed.test b/tests/tap-plan-malformed.test
index 316e54f..c8d2cdc 100755
--- a/tests/tap-plan-malformed.test
+++ b/tests/tap-plan-malformed.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..1 foo
diff --git a/tests/tap-plan-middle.test b/tests/tap-plan-middle.test
index c6f9c67..0775f10 100755
--- a/tests/tap-plan-middle.test
+++ b/tests/tap-plan-middle.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > top1.test <<END
non-TAP line, ignored
diff --git a/tests/tap-plan-whitespace.test b/tests/tap-plan-whitespace.test
index 74d9a67..7bdb4dc 100755
--- a/tests/tap-plan-whitespace.test
+++ b/tests/tap-plan-whitespace.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
sed 's/\$$//' > foo.test <<END
1..2 $
diff --git a/tests/tap-plan.test b/tests/tap-plan.test
index 6e57423..d85a3a2 100755
--- a/tests/tap-plan.test
+++ b/tests/tap-plan.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > top.test <<END
1..3
diff --git a/tests/tap-planskip-and-logging.test
b/tests/tap-planskip-and-logging.test
index ff1b49b..48b3e12 100755
--- a/tests/tap-planskip-and-logging.test
+++ b/tests/tap-planskip-and-logging.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
diff --git a/tests/tap-planskip-badexit.test b/tests/tap-planskip-badexit.test
index 1fab646..fbb3b56 100755
--- a/tests/tap-planskip-badexit.test
+++ b/tests/tap-planskip-badexit.test
@@ -23,7 +23,7 @@ am_parallel_tests=yes
echo TESTS = one.test two.test > Makefile.am
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > one.test <<'END'
#!/bin/sh
diff --git a/tests/tap-planskip-bailout.test b/tests/tap-planskip-bailout.test
index 932f6ee..7fb72e9 100755
--- a/tests/tap-planskip-bailout.test
+++ b/tests/tap-planskip-bailout.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..0 # SKIP
diff --git a/tests/tap-planskip-case-insensitive.test
b/tests/tap-planskip-case-insensitive.test
index 1376cb5..b26701c 100755
--- a/tests/tap-planskip-case-insensitive.test
+++ b/tests/tap-planskip-case-insensitive.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# These nested loops are clearer without indentation.
diff --git a/tests/tap-planskip-late.test b/tests/tap-planskip-late.test
index 545700e..f89a55d 100755
--- a/tests/tap-planskip-late.test
+++ b/tests/tap-planskip-late.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > foo.test <<END
some non-TAP text, will be copied in the global log
diff --git a/tests/tap-planskip-later-errors.test
b/tests/tap-planskip-later-errors.test
index 1dc2e1c..a73dbce 100755
--- a/tests/tap-planskip-later-errors.test
+++ b/tests/tap-planskip-later-errors.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..0
diff --git a/tests/tap-planskip-unplanned-corner.test
b/tests/tap-planskip-unplanned-corner.test
index 055cbb6..6dff7ac 100755
--- a/tests/tap-planskip-unplanned-corner.test
+++ b/tests/tap-planskip-unplanned-corner.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > foo.test <<END
1..0 # SKIP
diff --git a/tests/tap-planskip-unplanned.test
b/tests/tap-planskip-unplanned.test
index 2f4a0e5..4aeb4de 100755
--- a/tests/tap-planskip-unplanned.test
+++ b/tests/tap-planskip-unplanned.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
ok 1
diff --git a/tests/tap-planskip-whitespace.test
b/tests/tap-planskip-whitespace.test
index 4541011..a4dae99 100755
--- a/tests/tap-planskip-whitespace.test
+++ b/tests/tap-planskip-whitespace.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > foo.test <<END
1..0${tab}${tab} #${tab}SKIP ${tab}Strip leading & trailing ${tab}${tab}
diff --git a/tests/tap-planskip.test b/tests/tap-planskip.test
index 4d32a52..97ebd0c 100755
--- a/tests/tap-planskip.test
+++ b/tests/tap-planskip.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
weirdchars=\''"$!&()[]<>#;^?*/@%=,.:'
diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index 9ba5c25..51f7bba 100755
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -55,7 +55,7 @@ fi
cat > Makefile.am << 'END'
TESTS = all.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
#! /bin/sh
diff --git a/tests/tap-recheck-logs.test b/tests/tap-recheck-logs.test
index c42da23..53b2370 100755
--- a/tests/tap-recheck-logs.test
+++ b/tests/tap-recheck-logs.test
@@ -26,7 +26,7 @@ TESTS = foo.test bar.test baz.test
baz.log: zardoz
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
: > zardoz
diff --git a/tests/tap-result-comment.test b/tests/tap-result-comment.test
index 4e4fd7a..7162df0 100755
--- a/tests/tap-result-comment.test
+++ b/tests/tap-result-comment.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..5
diff --git a/tests/tap-summary-color.test b/tests/tap-summary-color.test
index c3edbcf..a28512b 100755
--- a/tests/tap-summary-color.test
+++ b/tests/tap-summary-color.test
@@ -20,4 +20,4 @@
. ./defs-static
use_colors=yes
-. "$testsrcdir"/tap-summary-aux.sh
+. "$am_testauxdir"/tap-summary-aux.sh
diff --git a/tests/tap-summary.test b/tests/tap-summary.test
index 8fe4e8b..deee099 100755
--- a/tests/tap-summary.test
+++ b/tests/tap-summary.test
@@ -20,4 +20,4 @@
. ./defs-static
use_colors=no
-. "$testsrcdir"/tap-summary-aux.sh
+. "$am_testauxdir"/tap-summary-aux.sh
diff --git a/tests/tap-test-number-0.test b/tests/tap-test-number-0.test
index 07d31f5..cf75cef 100755
--- a/tests/tap-test-number-0.test
+++ b/tests/tap-test-number-0.test
@@ -44,7 +44,7 @@ if test $am_tap_implementation = perl; then
fi
fi
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..1
diff --git a/tests/tap-todo-skip-together.test
b/tests/tap-todo-skip-together.test
index 5a07bcd..e911532 100755
--- a/tests/tap-todo-skip-together.test
+++ b/tests/tap-todo-skip-together.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..2
diff --git a/tests/tap-todo-skip-whitespace.test
b/tests/tap-todo-skip-whitespace.test
index 414d2ca..9d7afb9 100755
--- a/tests/tap-todo-skip-whitespace.test
+++ b/tests/tap-todo-skip-whitespace.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > stub.tap <<END
1 # TODO
diff --git a/tests/tap-todo-skip.test b/tests/tap-todo-skip.test
index 775fe35..e261d57 100755
--- a/tests/tap-todo-skip.test
+++ b/tests/tap-todo-skip.test
@@ -26,7 +26,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# ----------------------------------------------------- #
# Check all possible combinations of: #
diff --git a/tests/tap-unplanned.test b/tests/tap-unplanned.test
index 499f47a..252e946 100755
--- a/tests/tap-unplanned.test
+++ b/tests/tap-unplanned.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..1
diff --git a/tests/tap-whitespace-normalization.test
b/tests/tap-whitespace-normalization.test
index 3044f66..2274674 100755
--- a/tests/tap-whitespace-normalization.test
+++ b/tests/tap-whitespace-normalization.test
@@ -145,7 +145,7 @@ END
chmod a+x *.test
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Don't care about exit status or number of test results, they should be
# checked for in many other tests.
diff --git a/tests/tap-with-and-without-number.test
b/tests/tap-with-and-without-number.test
index a116dba..fc795f6 100755
--- a/tests/tap-with-and-without-number.test
+++ b/tests/tap-with-and-without-number.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..7
diff --git a/tests/tap-xfail-tests.test b/tests/tap-xfail-tests.test
index 6cede30..6107792 100755
--- a/tests/tap-xfail-tests.test
+++ b/tests/tap-xfail-tests.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo 'XFAIL_TESTS = $(TESTS)' >> Makefile
diff --git a/tests/test-driver-acsubst.test b/tests/test-driver-acsubst.test
index eefdd81..7df66ae 100755
--- a/tests/test-driver-acsubst.test
+++ b/tests/test-driver-acsubst.test
@@ -22,7 +22,7 @@ am_parallel_tests=yes
mkdir test-drivers
-cp "$testsrcdir"/trivial-test-driver test-drivers/triv \
+cp "$am_testauxdir"/trivial-test-driver test-drivers/triv \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cp "$am_scriptdir"/test-driver test-drivers/dflt \
|| fatal_ "failed to fetch auxiliary script test-driver"
diff --git a/tests/test-driver-cond.test b/tests/test-driver-cond.test
index 3129b9b..ac0b3f1 100755
--- a/tests/test-driver-cond.test
+++ b/tests/test-driver-cond.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cp "$am_scriptdir"/tap-driver.pl . \
|| fatal_ "failed to fetch auxiliary script tap-driver.pl"
diff --git a/tests/test-driver-custom-multitest-recheck.test
b/tests/test-driver-custom-multitest-recheck.test
index 267f0d5..9b4f5df 100755
--- a/tests/test-driver-custom-multitest-recheck.test
+++ b/tests/test-driver-custom-multitest-recheck.test
@@ -25,7 +25,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cat >> configure.ac << 'END'
diff --git a/tests/test-driver-custom-multitest-recheck2.test
b/tests/test-driver-custom-multitest-recheck2.test
index ddb24aa..3e7add6 100755
--- a/tests/test-driver-custom-multitest-recheck2.test
+++ b/tests/test-driver-custom-multitest-recheck2.test
@@ -24,7 +24,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cat >> configure.ac << 'END'
diff --git a/tests/test-driver-custom-multitest.test
b/tests/test-driver-custom-multitest.test
index 36cbc5f..c7959cd 100755
--- a/tests/test-driver-custom-multitest.test
+++ b/tests/test-driver-custom-multitest.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cat >> configure.ac << 'END'
diff --git a/tests/testsuite-summary-color.test
b/tests/testsuite-summary-color.test
index e2a0e68..0f00708 100755
--- a/tests/testsuite-summary-color.test
+++ b/tests/testsuite-summary-color.test
@@ -21,7 +21,7 @@
use_colors=yes
use_vpath=no
-. "$testsrcdir"/testsuite-summary-checks.sh || Exit 99
+. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
./configure
diff --git a/tests/testsuite-summary-count-many.test
b/tests/testsuite-summary-count-many.test
index 43c2b65..58157ad 100755
--- a/tests/testsuite-summary-count-many.test
+++ b/tests/testsuite-summary-count-many.test
@@ -22,8 +22,8 @@
am_parallel_tests=yes
. ./defs || Exit 1
-for s in trivial-test-driver extract-testsuite-summary; do
- cp "$testsrcdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
+for s in trivial-test-driver extract-testsuite-summary.pl; do
+ cp "$am_testauxdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
done
br='============================================================================'
@@ -97,7 +97,7 @@ $AUTOCONF
($MAKE check || : > make.fail) | tee stdout
test -f make.fail
-$PERL -w extract-testsuite-summary stdout > summary.got
+$PERL extract-testsuite-summary.pl stdout > summary.got
cat summary.exp
cat summary.got
diff summary.exp summary.got || Exit 1
diff --git a/tests/testsuite-summary-count.test
b/tests/testsuite-summary-count.test
index 70936fc..1d13e7e 100755
--- a/tests/testsuite-summary-count.test
+++ b/tests/testsuite-summary-count.test
@@ -21,7 +21,7 @@
use_colors=no
use_vpath=no
-. "$testsrcdir"/testsuite-summary-checks.sh || Exit 99
+. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
./configure
--
1.7.9
