From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 5 Apr 2012 19:20:29 +0000 (+0200)
Subject: tests: move most helper scripts and files into the 'ax' subdirectory
X-Git-Tag: v1.11b~6^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23f0543ef6113af566b6fc733ee8fa9f461785aa;p=thirdparty%2Fautomake.git

tests: move most helper scripts and files into the 'ax' subdirectory

* 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.lattarini@gmail.com>
---

diff --git a/syntax-checks.mk b/syntax-checks.mk
index d9d0c4d22..79f285f96 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 864bd24c2..8ebd31b4d 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 022d1d7f2..6965281bc
--- 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 e126bd5c6..309d47345
--- 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 447c89e6b..709101ed3 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 1ada9230b..c1500cdb6 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 37fcc2654..e583be12f 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 e80ff53ae..71ae3dd21 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 42262f7f3..719dc17d2 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 68ed990ac..32b1b803e 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 8799fde06..4e88f3de0 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 8019caa39..cc95d9881 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 cca50f98b..94084d460 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 b8d65542c..196263992 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 965eb3a43..9bc29dec5 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 6a13b6417..e6cc6c237 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 7f10d0d89..0def87ef5 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 edc795c66..b8c4004f9 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 7510243e3..5049171d5 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 24f88fbc7..31f5df6e2 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 9ddd1158d..1a8a99ba2 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 52ad93c2f..4d3bfda9c 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 087a72e8d..595c38458 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 5e0c1b4b4..8b242510b 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 236e92da4..abc1ace0d 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 00d973e88..6815ac54b 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 9f26a9583..bb51d54e5 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 c98ad6511..69dc5b016 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 f4e6f4621..78d5c9fea 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 4278f55d5..ca564e1e5 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 ce27a80c5..351b10d58 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 796b4b09b..e1ea4fd40 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 2d9827e98..115ffcdb9 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 8ca5b1cb9..04d379071 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 d6323ad12..6a515a8a8 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 58b89cce5..60aa5fe12 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 31e49cd20..8c464c418 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 80db0b451..67ecb1e5e 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 5b2d00fa5..c95e20e97 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 4cc260ad7..0236ef8ac 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 24c6d09b3..2fc993e01 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 3b69bf937..8da15e8c3 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 7cd188008..ac6e6687d 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 2574f2105..8cfffe2e4 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 e8d97e742..7aa2c7f09 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 e28827079..345b31f0f 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 3691e8e3a..b2f54f3b7 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 5e633b5e7..d9f36a251 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 aadeed6a8..75ce5f105 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 6f26eb6c5..da05b1b1a 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 9b0b34cbf..3b9cd1fe9 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 f38868b07..1b740599e 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 e49fb7607..bb45f31f6 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 316e54f6c..c8d2cdc30 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 c6f9c6799..0775f1029 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 74d9a67e2..7bdb4dc1d 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 6e574232b..d85a3a21f 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 ff1b49bc3..48b3e1238 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 1fab6460b..fbb3b56e6 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 932f6eeb0..7fb72e9d4 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 1376cb517..b26701c53 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 545700e64..f89a55dcc 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 1dc2e1c06..a73dbce36 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 055cbb6ef..6dff7ac27 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 2f4a0e5e3..4aeb4de81 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 4541011fd..a4dae998b 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 4d32a5253..97ebd0c66 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 9ba5c25be..51f7bba93 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 c42da23c2..53b2370cb 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 4e4fd7ace..7162df02a 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 c3edbcf36..a28512b69 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 8fe4e8b6f..deee09984 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 07d31f571..cf75cef4f 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 5a07bcd3e..e91153238 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 414d2ca97..9d7afb962 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 775fe35cd..e261d5790 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 499f47a2e..252e946c9 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 3044f6607..227467441 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 a116dbadf..fc795f6f9 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 6cede301c..610779201 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 eefdd8154..7df66ae77 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 3129b9bd6..ac0b3f171 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 267f0d591..9b4f5dfa3 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 ddb24aacd..3e7add6d4 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 36cbc5f91..c7959cd42 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 e2a0e6813..0f0070808 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 43c2b65e5..58157ad9b 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 70936fc98..1d13e7e6b 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