tests: simplify sourcing of helper shell files

Now that the early $PATH setup in both 'runtest' and AM_TESTS_ENVIRONMENT
allow the '.' built-in to find to-be-sourced shell scripts in the 't/ax/'
directory automatically, we can simplify several usages like:

   . "$am_testauxdir"/foo.sh

to just:

   . foo.sh

Also, because our test scripts run with the 'errexit' flag active, and
because POSIX mandates that, when the '.' built-in is used,

   ... if no readable file is found, a non-interactive shell shall abort ...

we can further simplify usages like:

    . "$am_testauxdir"/foo.sh || fatal_ "sourcing foo.sh"

once again to to just:

    . foo.sh

* ./defs, several tests: Adjusted.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/defs b/defs
index f69b7800cbb0de5dce08778522cadb6bded1e404..01e90b832cc7a6a025ab654055632310012bb566 100644 (file)
--- a/defs
+++ b/defs
@@ -20,4 +20,4 @@
 
 # Source the actual test initialization and setup code, and return
 # control to the test script that is sourcing us.
-. "$am_testauxdir/test-init.sh"
+. test-init.sh

diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh
index 74f258fb78e0029da0f149ff057f911e26df49e2..aaf2cd06dd6daf97b8628c0556529d3070b09f40 100755 (executable)
--- a/t/tap-ambiguous-directive.sh
+++ b/t/tap-ambiguous-directive.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 1..6

diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh
index abc4ec8c08f07081932fbeb4c28e4d707a0ab50e..876245ee835880e3b2be4d7829250a139680331e 100755 (executable)
--- a/t/tap-autonumber.sh
+++ b/t/tap-autonumber.sh
@@ -22,7 +22,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..14

diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh
index 5b49c33cf293219d26b791006c98885df97357f6..f87ccb3614eadb3860b6331a47a35743dfa3802a 100755 (executable)
--- a/t/tap-bailout-and-logging.sh
+++ b/t/tap-bailout-and-logging.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 First line

diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh
index d0d3096a459955ffae399ee07b940a88e44daad4..dfbadba101cce1c11087f5bd51531128dad7dde3 100755 (executable)
--- a/t/tap-bailout-leading-space.sh
+++ b/t/tap-bailout-leading-space.sh
@@ -23,7 +23,7 @@
 am_tap_implementation=shell
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test <<END
 1..1

diff --git a/t/tap-bailout-suppress-badexit.sh b/t/tap-bailout-suppress-badexit.sh
index c83ba8a8137471ad067c176e19b862a954f9adf5..7cd5458b7f5ebcb88843e250530580804d341cbe 100755 (executable)
--- a/t/tap-bailout-suppress-badexit.sh
+++ b/t/tap-bailout-suppress-badexit.sh
@@ -26,7 +26,7 @@ cat > Makefile.am <<END
 TESTS = $tests
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > exit.test << 'END'
 #!/bin/sh

diff --git a/t/tap-bailout-suppress-later-diagnostic.sh b/t/tap-bailout-suppress-later-diagnostic.sh
index 69ac88f59cfe949d9c38e16bfd1d5080eb3eae06..54e21fdc4b31316ba39f5ba4554935e3ac071b16 100755 (executable)
--- a/t/tap-bailout-suppress-later-diagnostic.sh
+++ b/t/tap-bailout-suppress-later-diagnostic.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 echo AM_TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
 

diff --git a/t/tap-bailout-suppress-later-errors.sh b/t/tap-bailout-suppress-later-errors.sh
index cd9aa146b89d8bd6d60851e89439d8fa2528e59d..bd90f8dbdb346c9327368d97a37253dfa39ad0f1 100755 (executable)
--- a/t/tap-bailout-suppress-later-errors.sh
+++ b/t/tap-bailout-suppress-later-errors.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 # Various errors that can all be squashed into a single test script.
 cat > foo.test << 'END'

diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh
index 91dfd2442866fe1398801825c3f104e966ea8132..08f12fdf09ae10449dedf91e9ba59d19e55850c3 100755 (executable)
--- a/t/tap-bailout.sh
+++ b/t/tap-bailout.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 : > exp
 

diff --git a/t/tap-color.sh b/t/tap-color.sh
index 2fa45d18475c2e0759a940419bcfa35b873827c1..a3fab2f94b4c742d58c3e481e5b077d94816dacd 100755 (executable)
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@ -36,7 +36,7 @@ TESTS = all.test skip.test bail.test badplan.test noplan.test \
         few.test many.test order.test afterlate.test
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test << 'END'
 1..5

diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index ee76e938f0c65cb1a32017bf69edc8b19823a509..8e84a63bc1057cb1d077d184ca841370da9e84a4 100755 (executable)
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
@@ -26,7 +26,7 @@ b.log: a.log
 c.log: b.log
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test << 'END'
 #!/bin/sh

diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh
index 10b4f5b013ccfdabec34a6a19c123784fb21e6b8..fc00af9696cc2ff3e355837c001325f8706d9254 100755 (executable)
--- a/t/tap-diagnostic.sh
+++ b/t/tap-diagnostic.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 metacharacters=\''"\$!&()[]<>#;^?*'
 

diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh
index c92a152aa1abc011195b02114e0a55fc4420dd58..ae0deef3c604718a89793a1f5006c858a75348a9 100755 (executable)
--- a/t/tap-empty-diagnostic.sh
+++ b/t/tap-empty-diagnostic.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 sed 's/\$$//' > all.test <<END
 1..1$

diff --git a/t/tap-empty.sh b/t/tap-empty.sh
index 976656d258839374f36fa9f393890ef366ba5bf8..e3d400c57873af46728a68556d03931d667e072a 100755 (executable)
--- a/t/tap-empty.sh
+++ b/t/tap-empty.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 # Empty TAP input.
 : > empty.test

diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh
index 30806635d4234f953afefe63fb0ebcfce22f99e1..49c63981c7080fce82413685dfa92d20ee8811a3 100755 (executable)
--- a/t/tap-escape-directive-2.sh
+++ b/t/tap-escape-directive-2.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..8

diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh
index 2fb1ad9fbfd3b3bb283ef7b442642b628600576a..9b59c3d8bf1b081e15d51dc9c4a6fc24e5460e91 100755 (executable)
--- a/t/tap-escape-directive.sh
+++ b/t/tap-escape-directive.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..2

diff --git a/t/tap-exit.sh b/t/tap-exit.sh
index 09493841f54b82caa169fb0e8b588df90745c16c..c9a9823b9f81697b35efaa6a42826f5f271cc840 100755 (executable)
--- a/t/tap-exit.sh
+++ b/t/tap-exit.sh
@@ -34,7 +34,7 @@ done
 
 chmod a+x *.test
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 $MAKE check >stdout && { cat stdout; exit 1; }
 cat stdout

diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh
index f879cceab58b5a208cb734dc12f3c755119f0d2e..9ca50217a9c8cc006d1191c552dd33fb65d15d4f 100755 (executable)
--- a/t/tap-fancy.sh
+++ b/t/tap-fancy.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 #
 # From manpage Test::Harness::TAP(3):

diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh
index 88ef41209a778c879eea50014b80ce8022faccff..d69cf50350924fb0ee0c4649e889726c4a63b765 100755 (executable)
--- a/t/tap-fancy2.sh
+++ b/t/tap-fancy2.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 #
 # From manpage Test::Harness::TAP(3):

diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh
index 85db2cb34993d58a641da584dcaf88a478fcda53..31e1ccb4f7936c9329536791ac5fb72530fa458b 100755 (executable)
--- a/t/tap-global-log.sh
+++ b/t/tap-global-log.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > ok.test << 'END'
 1..5

diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh
index ba232c3b3fd70193db32bfccae2d8fa415eaede9..528c7bb5e4fed4a422973b43bd0d05787b8c14f8 100755 (executable)
--- a/t/tap-global-result.sh
+++ b/t/tap-global-result.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > ok.test <<END
 1..3

diff --git a/t/tap-log.sh b/t/tap-log.sh
index 32cb475e95d93aede2584385aec25aeb5c169123..2e92f2153fe5fb2535b0a5896174dff14fc38276 100755 (executable)
--- a/t/tap-log.sh
+++ b/t/tap-log.sh
@@ -29,7 +29,7 @@ TESTS = pass.test skip.test xfail.test fail.test xpass.test error.test
 TEST_SUITE_LOG = global.log
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 # Custom markers, for use in grepping checks.
 cmarker=::: # comment marker

diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh
index 1fe4b85634b982918a87c232c0c6e1ff6d3ec117..b13d41d7fb1cfa86443364b65451cb6aa214c7d4 100755 (executable)
--- a/t/tap-merge-stdout-stderr.sh
+++ b/t/tap-merge-stdout-stderr.sh
@@ -27,7 +27,7 @@ AM_TEST_LOG_DRIVER_FLAGS = --comments --merge
 TESTS = all.test
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 #!/bin/sh

diff --git a/t/tap-missing-plan-and-bad-exit.sh b/t/tap-missing-plan-and-bad-exit.sh
index ddd74c8a7c59608b432e24f8a5a24127fe47c5fc..06a6f88801f40d25ca3351f5f10054731c25d85c 100755 (executable)
--- a/t/tap-missing-plan-and-bad-exit.sh
+++ b/t/tap-missing-plan-and-bad-exit.sh
@@ -30,7 +30,7 @@ echo TESTS = foo.test > Makefile.am
 
 chmod a+x foo.test
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 $MAKE check >stdout && { cat stdout; exit 1; }
 cat stdout

diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh
index cf8918c74ba174000d0dcfd3b48d8d0fabc8df1c..bdda865a0e31148c999a209ed9b91714d7448ea5 100755 (executable)
--- a/t/tap-msg0-bailout.sh
+++ b/t/tap-msg0-bailout.sh
@@ -21,7 +21,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 echo 'Bail out! 0' > a.test
 echo 'Bail out! 0.0' > b.test

diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh
index 9859e72905c60caa203fbc2813d7b8884eaa5647..9be3816d00edd67a46cc676ae5d8faeff3b94888 100755 (executable)
--- a/t/tap-msg0-directive.sh
+++ b/t/tap-msg0-directive.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test << 'END'
 1..3

diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh
index 166b78534baf72203eb7f4c2199bfe6c77370b86..d7751d7d240fd5e9a2138697b4a01ae973e8b769 100755 (executable)
--- a/t/tap-msg0-misc.sh
+++ b/t/tap-msg0-misc.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test << 'END'
 1..14

diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh
index 7602affb19ded220cbaf91faf5374dfb2d33012b..24e569c1f6308f96b98adb1454c42f754ae3ccdf 100755 (executable)
--- a/t/tap-msg0-planskip.sh
+++ b/t/tap-msg0-planskip.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 echo '1..0 # SKIP 0' > a.test
 echo '1..0 # SKIP 0.0' > b.test

diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh
index a1174bcde8e408d20d3932f67b6df6c273a18f5e..f55b0559efa944722d9b238ef26e117fc92100a4 100755 (executable)
--- a/t/tap-msg0-result.sh
+++ b/t/tap-msg0-result.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test << 'END'
 1..10

diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh
index 765442a5e315828012d158b60798c4e57e43fd33..fbf54be53dda821120e55dfafe25414334ebcd03 100755 (executable)
--- a/t/tap-negative-numbers.sh
+++ b/t/tap-negative-numbers.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..7

diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh
index e9a1091515a671bc77716c33ca925240595c64d3..dc4cad34af0b658941c27fbc6ead481a726b2e1d 100755 (executable)
--- a/t/tap-no-disable-hard-error.sh
+++ b/t/tap-no-disable-hard-error.sh
@@ -26,7 +26,7 @@ TEST_LOG_COMPILER = cat
 TESTS = bail.test few.test noplan.test
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > bail.test <<END
 1..1

diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
index e82b26b99d9274b33d2864c53cf617fe553a8b34..f1013156b82dc42cb1ac528f6533e729524240e8 100755 (executable)
--- a/t/tap-no-merge-stdout-stderr.sh
+++ b/t/tap-no-merge-stdout-stderr.sh
@@ -25,7 +25,7 @@ TEST_LOG_DRIVER_FLAGS = --comments
 TESTS = all.test
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 #!/bin/sh

diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
index 3f994980f6aa2ad790cc4d179390299b35bd011c..81104afbcac35fec71bdc3ba5d8a3fd37d7bf830 100755 (executable)
--- a/t/tap-no-spurious-numbers.sh
+++ b/t/tap-no-spurious-numbers.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > prefixes <<'END'
 A

diff --git a/t/tap-no-spurious-summary.sh b/t/tap-no-spurious-summary.sh
index 85e1bbaa2dcc2c72e4b423676b01281606e953b1..13c577c7a0eec5778b8f3bb1a792c832a3cc3fe7 100755 (executable)
--- a/t/tap-no-spurious-summary.sh
+++ b/t/tap-no-spurious-summary.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..1

diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh
index ebb58cf879e930d1d0d78a9c22742d739f60f0ef..bc98a0900ab72a4ce807eb9fa0d00e18da9dbfec 100755 (executable)
--- a/t/tap-no-spurious.sh
+++ b/t/tap-no-spurious.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 echo 1..5 > all.test
 

diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh
index f73bb03959db56b22b5cf82b1d59513edf2e95a4..bbb9a032a398f455b66906c2ccd78fedc893e3bd 100755 (executable)
--- a/t/tap-not-ok-skip.sh
+++ b/t/tap-not-ok-skip.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..4

diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh
index 219a1591888b0e5b78121dbf8a41842d12288d98..2d15121c3f01ea95b755d8ca63000fbbf1e4d141 100755 (executable)
--- a/t/tap-number-wordboundary.sh
+++ b/t/tap-number-wordboundary.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..5

diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh
index fd1c3b62d280b68211c7197a61c6449df6e6907b..620addfb56eca5ee497f22617a923a37ad188140 100755 (executable)
--- a/t/tap-numbers-leading-zero.sh
+++ b/t/tap-numbers-leading-zero.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 do_checks ()
 {

diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh
index 60292a76c4a5b89a03ba401d516a5b069312df9d..61bc252419da52b967b89ae3702576799e747424 100755 (executable)
--- a/t/tap-numeric-description.sh
+++ b/t/tap-numeric-description.sh
@@ -18,7 +18,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. 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/t/tap-out-of-order.sh b/t/tap-out-of-order.sh
index e884a1e0793f9113e7b029f0d2d11357f1dabd96..ff0e8061423be5ad2a654cb3007cbad5195b400e 100755 (executable)
--- a/t/tap-out-of-order.sh
+++ b/t/tap-out-of-order.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test <<END
 1..3

diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh
index 7b800d5bc262befbe4afd99801f482f83ce38fa8..f6507e0f4eeea94e36b86abe1dc9d42fdead7e45 100755 (executable)
--- a/t/tap-passthrough-exit.sh
+++ b/t/tap-passthrough-exit.sh
@@ -38,7 +38,7 @@ END
   echo TESTS += exit-$e.test >> Makefile.am
 done
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 st=0
 $MAKE check || st=$?

diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh
index 993e750e803b18cdd123667e71168b294022d5ed..e2eae177f8f698b6f696ecc0845394157f8df0b3 100755 (executable)
--- a/t/tap-passthrough.sh
+++ b/t/tap-passthrough.sh
@@ -24,7 +24,7 @@
 
 weirdchars=\''"\$@!&()[]<>#;,:.^?*/'
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 #
 # Only successful tests.

diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh
index 86ba401e8a5509b17080d8c2e8f8341dc0b39675..8fc0c7e0f9de2d7215606ae7a4969d8f0b80bcdc 100755 (executable)
--- a/t/tap-plan-corner.sh
+++ b/t/tap-plan-corner.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 # -------------------------------------------------------------------------
 

diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh
index 21fd0131203ddb7cc4918638bcb9ccc95d0db653..4b6a4105f110d2edfbd81f43deb34cff7b8393a3 100755 (executable)
--- a/t/tap-plan-errors.sh
+++ b/t/tap-plan-errors.sh
@@ -25,7 +25,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 my_check ()
 {

diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
index 84047a664cc4b0537a91214b59e7be6a3eecefe2..dc1923c9f341083a6a7adc71a848f4e02d71255d 100755 (executable)
--- a/t/tap-plan-leading-zero.sh
+++ b/t/tap-plan-leading-zero.sh
@@ -21,7 +21,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test <<END
 1..01

diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
index 68a0f474f1b24c3d2accf932dcca024697e1b23c..cf43d472876b0642271de9c0b12ac85b7904711b 100755 (executable)
--- a/t/tap-plan-malformed.sh
+++ b/t/tap-plan-malformed.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test <<END
 1..1 foo

diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh
index 77f16a74ac2b42eff5e78b65916aff8b9b84d6dd..971869bf1bf5c4e303af43d5f9dfcae6cfec4be5 100755 (executable)
--- a/t/tap-plan-middle.sh
+++ b/t/tap-plan-middle.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > top1.test <<END
 non-TAP line, ignored

diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh
index 106cad0786ef13da893b0f6738685dde3aec9407..5cc198feabb8e0f5e2d6acd404f88ecf89e037b7 100755 (executable)
--- a/t/tap-plan-whitespace.sh
+++ b/t/tap-plan-whitespace.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 sed 's/\$$//' > foo.test <<END
 1..2 $

diff --git a/t/tap-plan.sh b/t/tap-plan.sh
index 40fc8c30de24f6c410c6e79857c125bd44d568a0..d22287033b44cbc8b92940c0d7759ac832293a49 100755 (executable)
--- a/t/tap-plan.sh
+++ b/t/tap-plan.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > top.test <<END
 1..3

diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
index 7c1e017b942214e19e6660658329db3cd74bb509..33e5f7f5d511cf1c84b8968166981ea5a3396c95 100755 (executable)
--- a/t/tap-planskip-and-logging.sh
+++ b/t/tap-planskip-and-logging.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 echo TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
 

diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh
index 1b208648f26c3cb2fa604995e4a331b4a8abbd13..0bcc7e315def0f72a4239b57b24a417d2f8c3944 100755 (executable)
--- a/t/tap-planskip-badexit.sh
+++ b/t/tap-planskip-badexit.sh
@@ -22,7 +22,7 @@
 
 echo TESTS = one.test two.test > Makefile.am
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > one.test <<'END'
 #!/bin/sh

diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh
index 255443d7b9782320632949084d255501a327c43c..6558a697068e8fc8bed2db0d94ee6c22e0dfc40b 100755 (executable)
--- a/t/tap-planskip-bailout.sh
+++ b/t/tap-planskip-bailout.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 1..0 # SKIP

diff --git a/t/tap-planskip-case-insensitive.sh b/t/tap-planskip-case-insensitive.sh
index a67712b8d8fe68434f07e28e1b7d69fb2930d33a..ece3b2555fc368acf834115270762aa1de75bc94 100755 (executable)
--- a/t/tap-planskip-case-insensitive.sh
+++ b/t/tap-planskip-case-insensitive.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 # These nested loops below are clearer without indentation.
 i=0

diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh
index af337336aff28dd616e9659361b1c784df188efc..678bd19494467101d949be36c31b0227dbd27a94 100755 (executable)
--- a/t/tap-planskip-late.sh
+++ b/t/tap-planskip-late.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > foo.test <<END
 some non-TAP text, will be copied in the global log

diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh
index 3a403c7291231fabec0d220942fe82c9725037d9..c8400446e23c61220d4f344a1afc80c0e4409b85 100755 (executable)
--- a/t/tap-planskip-later-errors.sh
+++ b/t/tap-planskip-later-errors.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 1..0

diff --git a/t/tap-planskip-unplanned-corner.sh b/t/tap-planskip-unplanned-corner.sh
index 2ce46863cee38f7b3e9bf5640d8b374329b1ffd9..ef9ab3c55c43eda7c22eb6533222a9e4a9a88f14 100755 (executable)
--- a/t/tap-planskip-unplanned-corner.sh
+++ b/t/tap-planskip-unplanned-corner.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > foo.test <<END
 1..0 # SKIP

diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh
index 01e5895fb4a1fce889981236018431ef45530621..5fa8ca52db3c848dcd1be0cd8a27a95b08d10a47 100755 (executable)
--- a/t/tap-planskip-unplanned.sh
+++ b/t/tap-planskip-unplanned.sh
@@ -21,7 +21,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 ok 1

diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh
index d9c54963e250a71cf2957bffab37c521e5c02616..5ae9d3af578b122dc4dcb4a56b57d6afa85d1255 100755 (executable)
--- a/t/tap-planskip-whitespace.sh
+++ b/t/tap-planskip-whitespace.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > foo.test <<END
 1..0${tab}${tab}   #${tab}SKIP  ${tab}Strip leading & trailing ${tab}${tab}

diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh
index 9e6704b28c336a1582c60ae8893f0b6406c2847d..76a72446c41b1ddbc2799ab52f0ba9af35a9ad92 100755 (executable)
--- a/t/tap-planskip.sh
+++ b/t/tap-planskip.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 weirdchars=\''"$!&()[]<>#;^?*/@%=,.:'
 

diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
index ecd3bef449df55beb37376a0d7a98933112127b0..92d78313be186f763524f209fc72ee70bd777c62 100755 (executable)
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.sh
@@ -54,7 +54,7 @@ fi
 cat > Makefile.am << 'END'
 TESTS = all.test
 END
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 #! /bin/sh

diff --git a/t/tap-recheck-logs.sh b/t/tap-recheck-logs.sh
index e774f731002c93542611ef69ce3356d7851e2dc9..1b7597e33b3205358cfc9cfafd6358009eb061c5 100755 (executable)
--- a/t/tap-recheck-logs.sh
+++ b/t/tap-recheck-logs.sh
@@ -25,7 +25,7 @@ TESTS = foo.test bar.test baz.test
 baz.log: zardoz
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 : > zardoz
 

diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh
index 42907518e1048a3fe5f65ef7e7371036252de072..714f328fd868ec6929ac56ae05eda96eca29fb61 100755 (executable)
--- a/t/tap-result-comment.sh
+++ b/t/tap-result-comment.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 1..5

diff --git a/t/tap-summary-color.sh b/t/tap-summary-color.sh
index 8f533b4d1e585d51fde1324a820959c82eefb267..c84e848389389feca0e52340b4148ad307a7a77b 100755 (executable)
--- a/t/tap-summary-color.sh
+++ b/t/tap-summary-color.sh
@@ -20,4 +20,4 @@
 . test-defs.sh
 
 use_colors=yes
-. "$am_testauxdir"/tap-summary-aux.sh
+. tap-summary-aux.sh

diff --git a/t/tap-summary.sh b/t/tap-summary.sh
index 846239cfe19023ca206456a6e61de05dad41ebb0..6e0e798f8725da262bbe9faa057b074a67fa4482 100755 (executable)
--- a/t/tap-summary.sh
+++ b/t/tap-summary.sh
@@ -20,4 +20,4 @@
 . test-defs.sh
 
 use_colors=no
-. "$am_testauxdir"/tap-summary-aux.sh
+. tap-summary-aux.sh

diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
index c085da0c9ff4320781244b91e2bc69bdc986b9f9..f36034930cfc1abae2e73907bbe45dcdabee39e7 100755 (executable)
--- a/t/tap-test-number-0.sh
+++ b/t/tap-test-number-0.sh
@@ -43,7 +43,7 @@ if test $am_tap_implementation = perl; then
   fi
 fi
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test <<END
 1..1

diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh
index b54013a32868e878feeb8b6071e5bf2693805743..dc9e160b3cd0e06609a1df1edeb45c6a9d445191 100755 (executable)
--- a/t/tap-todo-skip-together.sh
+++ b/t/tap-todo-skip-together.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 1..2

diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh
index b9c8825899e407adc1ad8096de0bf6310d47781a..b979c8be556d2fb2a087e0e0a0111795dbfdf687 100755 (executable)
--- a/t/tap-todo-skip-whitespace.sh
+++ b/t/tap-todo-skip-whitespace.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > stub.tap <<END
 1 # TODO

diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
index 81a8128efc4d4827e41ab1e6c88a9b9814a8083f..c4e47cfa391cf6c844fd001865259c0b80fabfa0 100755 (executable)
--- a/t/tap-todo-skip.sh
+++ b/t/tap-todo-skip.sh
@@ -25,7 +25,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 # ----------------------------------------------------- #
 #  Check all possible combinations of:                  #

diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh
index e00e4b89a84e1c5c99d411808174842510402adc..75ad7bf7a6d4240760cfeaa8c0877fc5080c63d3 100755 (executable)
--- a/t/tap-unplanned.sh
+++ b/t/tap-unplanned.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 1..1

diff --git a/t/tap-whitespace-normalization.sh b/t/tap-whitespace-normalization.sh
index 2b1f627b897d6a5f4c08339d6c15e3ee26c4401b..0cbf90bc461dde17b15793cde0d91fd7df82fb29 100755 (executable)
--- a/t/tap-whitespace-normalization.sh
+++ b/t/tap-whitespace-normalization.sh
@@ -144,7 +144,7 @@ END
 
 chmod a+x *.test
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. 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/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh
index c69a40ad67364a2911ac860b810edac8c17342f8..6d69eb6f331f581680539253f87a7528c9e93437 100755 (executable)
--- a/t/tap-with-and-without-number.sh
+++ b/t/tap-with-and-without-number.sh
@@ -21,7 +21,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<'END'
 1..7

diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh
index aa86dca5da99d347908fa546184584d84ef44922..94ae1c906117dc4685da98eba01cccb96ac44579 100755 (executable)
--- a/t/tap-xfail-tests.sh
+++ b/t/tap-xfail-tests.sh
@@ -19,7 +19,7 @@
 
 . ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 echo 'XFAIL_TESTS = $(TESTS)' >> Makefile
 

diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
index e1a74715468ed94b3b0488d6b318c405e19d4837..a0effd6893f9759b8fbb19bbdf83b4beea58ea88 100755 (executable)
--- a/t/testsuite-summary-color.sh
+++ b/t/testsuite-summary-color.sh
@@ -21,7 +21,7 @@
 use_colors=yes
 use_vpath=no
 
-. "$am_testauxdir"/testsuite-summary-checks.sh || exit 99
+. testsuite-summary-checks.sh
 
 ./configure
 

diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
index a6e546299e0d013b16157758c5cccd50dfba9251..47bb66317106c9c4db1e3b52ba2d435d077f041d 100755 (executable)
--- a/t/testsuite-summary-count.sh
+++ b/t/testsuite-summary-count.sh
@@ -21,7 +21,7 @@
 use_colors=no
 use_vpath=no
 
-. "$am_testauxdir"/testsuite-summary-checks.sh || exit 99
+. testsuite-summary-checks.sh
 
 ./configure