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 d9d0c4d22a5f150a3778361f54ef7719771b5845..79f285f96f254ca72a441c19fab4016839323a0f 100644 (file)
--- 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 864bd24c2a16798b91b4af1a59313ee0af754a70..8ebd31b4d6785c99633ff52e9a15063118535c12 100644 (file)
--- 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 (executable)
new mode 100644 (file)
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 (executable)
new mode 100644 (file)
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 (executable)
new mode 100644 (file)
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 (executable)
new mode 100644 (file)
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 447c89e6b2838a71733b43714474cf1dea9d2ef2..709101ed3b3c4371d0e29815a023175ff09ae9dd 100644 (file)
--- 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 1ada9230b9e87a7410dd87982d3e891de493fcbd..c1500cdb696291d7507541dd3e5824e16e7ae74f 100644 (file)
--- 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 37fcc26543315e5a1265d5abe5a5520886f3fa1c..e583be12f86ea9bfac950d7df87c63f4eaaa86f4 100755 (executable)
--- 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 e80ff53ae95c4ee8bbf7d500df8ae459d05d3fa1..71ae3dd2178191deea28f4e80f23fdb82a0dce97 100755 (executable)
--- 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 42262f7f3e11fc682f8c4ec2dabe041e00f5fba3..719dc17d2f8dc390eb853445d39dfd3aebae3926 100755 (executable)
--- 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 68ed990ac5b437ef68f50c573ac8afec1b0feafc..32b1b803e35849bb47f1d45f15ff6ff0af3065de 100755 (executable)
--- 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 8799fde06f63885c320889951c1e16003e40c460..4e88f3de04bb57ca4cc96ddc011f64cc31a3b7d5 100755 (executable)
--- 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 8019caa392519e41013b8e657fd11adb89d9a1d3..cc95d98813ed525b0c08de9c62b4018d03ad231c 100755 (executable)
--- 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 cca50f98b8d150a44b2db2ac50a3d5d2df406899..94084d4608c6e8d6e6c06bc289e545cc0206f2e8 100755 (executable)
--- 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 b8d65542cb305cabd79858bad5586284698f01a2..1962639924f5fbc8803e0a0b0fa12c541837b53e 100755 (executable)
--- 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 965eb3a432d299989a3a3a7a0bd244d25f38dccf..9bc29dec57d2ea467576f3bc37d0cecab131a175 100755 (executable)
--- 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 6a13b641728051db50e2fee377e8930e0c79da45..e6cc6c237fe15a34929f5fb8c5b82be23e88e6f1 100755 (executable)
--- 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 7f10d0d8960ea8d9b50d40ce38c63aaec92bf252..0def87ef5cf101ba3db2c725cd1d2bbcd3172b0f 100755 (executable)
--- 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 edc795c66b0f627aca7929a00bd01cc90450b53a..b8c4004f97000e5bd7c8fa41b866c89c5c4f4cca 100755 (executable)
--- 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 7510243e30528af6b7496fc4a0ed98fe6dfc7a20..5049171d560b9ab8b05c94437eef3dff08b386df 100755 (executable)
--- 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 24f88fbc70a3692eb3dbeacf951136e7dcd229c1..31f5df6e235ec15a167c51217ecfebdf3eae8945 100755 (executable)
--- 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 9ddd1158d2146333409483f99671111dc65867a7..1a8a99ba2a8db27c5c4012bf6f8b8319ad941e45 100755 (executable)
--- 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 52ad93c2fc3fd4f26b6044f2791fa7091e2ae06e..4d3bfda9cc78fdbe3a18cdaeba39c0831efed979 100755 (executable)
--- 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 087a72e8de9bb49a6dcd8929304933a1ccf4cb52..595c384583f45451a1cc3e7e287fadca27414ea0 100755 (executable)
--- 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 5e0c1b4b4695eed4e306d952e3336b07646b6260..8b242510b129d7aee7c662facbed0f3c6a339042 100755 (executable)
--- 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 236e92da4372079bdcfba45c21a570bc52e9850f..abc1ace0d059b799d003e258cd4d338f3676f0a8 100755 (executable)
--- 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 00d973e88afa35b7957130567c446ca19c2639b1..6815ac54bbb3370bdba559ae9c62fe8410270832 100755 (executable)
--- 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 9f26a9583cd5a707678a2772b15bbd8abfc7ad2b..bb51d54e5623dc8f5737a7fda3fefb1e2fa26240 100755 (executable)
--- 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 c98ad65116131ec1e00db8b645417068ee13ef32..69dc5b016dc8c55b7b2b4b87f57142763e2a3818 100755 (executable)
--- 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 f4e6f46213d4743e14562f7608586b1dfd0e97d6..78d5c9feaa0e55d33ca0a092e772e30bed5b3a33 100755 (executable)
--- 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 4278f55d54293ab06e17106fde826896dd62a159..ca564e1e5265cac67345a640da28235b7a6d4923 100755 (executable)
--- 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 ce27a80c56319ee857f7a7213ba08c5c6377d5c1..351b10d58e37908ebeccabc28d2268cbff024b2a 100755 (executable)
--- 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 796b4b09bc548a82af322c8d662f3c41619915de..e1ea4fd40ce8ffdda25e866e1d1d1432e3dc1a62 100755 (executable)
--- 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 2d9827e9839b7ea1960692987aa61409b83e3f99..115ffcdb93bd1d1d40f21c82848736c9178bd3c0 100755 (executable)
--- 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 8ca5b1cb9ea2632678be7abca4f3c601619806df..04d379071d5b9d019e9918628b837654b1383bef 100755 (executable)
--- 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 d6323ad128b8e7cfdf3e63fd7fb9510f92b9498c..6a515a8a877aca25734c99e0fcb508f1fb1efb5b 100755 (executable)
--- 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 58b89cce5aa50ac75461aa3af7305587eb829785..60aa5fe12f2e7df1d407185379270a71e1686bf1 100755 (executable)
--- 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 31e49cd20b2eac3aaca138f3dbd1c12bd40e31a9..8c464c4188f84baacd0c3115889c0f55dfaa495d 100755 (executable)
--- 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 80db0b4511ca4719716b0686c8f5701e1adbaf5b..67ecb1e5eca83989a66612cab8499572eb88d9c1 100755 (executable)
--- 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 5b2d00fa5438d06bb0c097f89426a1b56603b340..c95e20e97b4ea44dd1ef645f10d49707c1bc478a 100755 (executable)
--- 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 4cc260ad713a5a044373d884a1a1acf7aba66b68..0236ef8ac75529402e25549f66e34f3006dbf135 100755 (executable)
--- 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 24c6d09b35ecc71772f9316b3cd68135d6953e0c..2fc993e0121eb1d8deaa9b95284b17b46773ab20 100755 (executable)
--- 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 3b69bf937081ac7a27b8cae19653188c98bcba33..8da15e8c332f29b90da6e073dfe19d5daeedea7d 100755 (executable)
--- 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 7cd1880083626c896f7806d3f08fcbd35057ad59..ac6e6687d110b27ab67cb75cd5bee14649f43036 100755 (executable)
--- 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 2574f2105b0a8f977a47c8a339924c31c1e16cdf..8cfffe2e47af9cace9ef87d546fe719f9f39b63d 100755 (executable)
--- 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 e8d97e7426b39eeaa76a9935487226848026ce91..7aa2c7f094145c833ef8cfa196c08ad849c5391c 100755 (executable)
--- 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 e288270791f1726b5d2efad30ecf83722875256f..345b31f0fb9095ed8fc97c34595253bf53c338ba 100755 (executable)
--- 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 3691e8e3a4bf07bd429f0bdf39878739b6d1b06e..b2f54f3b75a0527eb7abab568f1fa268038f8e54 100755 (executable)
--- 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 5e633b5e7673e46ee77016ed5dc499e03eceea31..d9f36a251dad4f88d97af4903c5e369923a588ff 100755 (executable)
--- 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 aadeed6a82be024e8ba5f178d02b4a6a64674a75..75ce5f105a708f82c4ffd704dd59218a268057b6 100755 (executable)
--- 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 6f26eb6c583102ba5c9a1d147b5a2b037dabf174..da05b1b1a9cde4fd28fe7819189ab1df583739e2 100755 (executable)
--- 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 9b0b34cbf57e8a64786662c3eaa9ee462726b970..3b9cd1fe93c86b59c764e7fdc53c4ee955cf6ec4 100755 (executable)
--- 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 f38868b07b741cc96dd020a20f0351fb6aed25a4..1b740599e4badfe138bef6651028dd71bc134d46 100755 (executable)
--- 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 e49fb76073c934067781c4b5b4467bca230abfe8..bb45f31f6a638a4d535c2fd4de85f32067918f70 100755 (executable)
--- 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 316e54f6cbfc7d0784877a9872b684d3270e326a..c8d2cdc30c21f90e27880661da73be8db50f53e7 100755 (executable)
--- 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 c6f9c67998b105d37f64226efc35f11a95c9fb91..0775f1029381eb073d289d1b31d4ef8be6f7ef7d 100755 (executable)
--- 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 74d9a67e21c4ed2ab4681e4d75598f4645fc9571..7bdb4dc1d9fce7852e14bd4dac95ebd497c4b24f 100755 (executable)
--- 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 6e574232b1a077c7818a3e8542ec0ace5b440e69..d85a3a21f0ac11455a36c3a292a82e178567579f 100755 (executable)
--- 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 ff1b49bc3699dd747219f361f8813fb5a69b7b23..48b3e1238eda196a7347b2cb4b46de8e5ac80ac0 100755 (executable)
--- 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 1fab6460bb6369f0f6b29342f4f84515193d834c..fbb3b56e6678cad05af30b6a0ece2bc6f2b76ad0 100755 (executable)
--- 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 932f6eeb075af5ce73334a68c5bccbc905d429d8..7fb72e9d4d3ebd09ffe8642c85634777004b858a 100755 (executable)
--- 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 1376cb51700db7675ac452aced2777e1e6bffa2b..b26701c53f6d3c771e3d7abec18d2c352bc4f76b 100755 (executable)
--- 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 545700e6478a031c4e90f40865b2a53b61738a67..f89a55dcc97138bfe1f7cb8ba325f890671363a6 100755 (executable)
--- 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 1dc2e1c0699c8c35e4c519204ea8150635c69fae..a73dbce36b28aa6cd4842279b5ee5dd2398d397c 100755 (executable)
--- 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 055cbb6ef044e4a77d934459291ae59c35bf102a..6dff7ac2709b2f8766d5199958bc7f09121009a2 100755 (executable)
--- 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 2f4a0e5e3f8b042e68eb2437dfc3d10f3f23463b..4aeb4de8137737c21d3f2f670851f92854a891cb 100755 (executable)
--- 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 4541011fdd5fe5a7edb0650b829ee77cd8f0ff36..a4dae998b5fa491256a3f45ff5c94b97422f5c04 100755 (executable)
--- 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 4d32a5253b1110ca04e63e5298e33886aa010ae9..97ebd0c660693e298d376f52b64c26aeced85cdd 100755 (executable)
--- 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 9ba5c25be758abf918b5ee382b5dc8bab9e3e7b6..51f7bba939497232a30c15bbc4c75f0b35a52854 100755 (executable)
--- 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 c42da23c2d3538e7d75569e0994b92c0224671bd..53b2370cb620350c2ea293837faea4300aadfd54 100755 (executable)
--- 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 4e4fd7acebb6ecccd39dd48c69842432c164c2b8..7162df02afb5993412b04325af5c0ef914b49e82 100755 (executable)
--- 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 c3edbcf36af658ee084d730fd451e338f0195e08..a28512b69f5d77fa0a6878414ce474fbff89cb65 100755 (executable)
--- 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 8fe4e8b6f48f57cd40739369bc1a04a5d544816a..deee0998427941e06fea16bbe2a0b33ed228df92 100755 (executable)
--- 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 07d31f5717d5e12031b3026b92ba3ee93627c4bb..cf75cef4fc0b9e9ef260a08364b975b6d494972e 100755 (executable)
--- 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 5a07bcd3eb9653ee5542e9e2d5cb9851ab0609d2..e91153238d77e6dac1d347079e268028607c6ad3 100755 (executable)
--- 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 414d2ca979d81675c5d32a2030db2982a2e662c1..9d7afb962b2535bccdf076f90d397dde431fc5b4 100755 (executable)
--- 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 775fe35cd160a543c50de049b874596692b27327..e261d57900ef2c0c1c134baa5ab21033566a4683 100755 (executable)
--- 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 499f47a2eaa9b2fc41aad636980f9b69b5644ea8..252e946c9398e0ad1853782cded0ba616e0ae829 100755 (executable)
--- 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 3044f66073e84b817c8fc74e7042ef9ac10b6298..227467441d0256e9fd5470516a674fea3e6a5de6 100755 (executable)
--- 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 a116dbadf1615a798f66d28c5f782d2790ade79b..fc795f6f9def1c06993812c104c27954e5f140b7 100755 (executable)
--- 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 6cede301c2bf81e6eac254300d8e993e21634011..610779201269e3a6a8b9d84a7152d6340a448cca 100755 (executable)
--- 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 eefdd815469e5039126ceb32efe895c998270bef..7df66ae779ff643247744cbeab74a99137e88484 100755 (executable)
--- 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 3129b9bd649e95767c0abdfb315b78bee49c190d..ac0b3f1710c1d23d8429be2de818d38b31b68404 100755 (executable)
--- 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 267f0d59138871c98e9e0ecdc1d6c04a9c0d902c..9b4f5dfa3d48c0b6c1cca69519dd2b34f0d487a0 100755 (executable)
--- 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 ddb24aacd32826990d288db8693b55f6a10697b8..3e7add6d4d205895caea6276097096142908d78c 100755 (executable)
--- 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 36cbc5f918d69ee198953004dc78c99ed16e0f78..c7959cd42c1a41ad070b826f862eac5b74bead5d 100755 (executable)
--- 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 e2a0e6813cae984b976d060519190cabae91c893..0f0070808abbadc5c070c4ffe879089023fc4b13 100755 (executable)
--- 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 43c2b65e564fde0724736185fa57b3b946f54282..58157ad9b5312144c605da064b714a837c2ea313 100755 (executable)
--- 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 70936fc9855950015d2fe500aef31e92c072a13f..1d13e7e6bd14e05cb621fda1d8201cdd991831d2 100755 (executable)
--- 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