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.lattar...@gmail.com> --- defs | 2 +- t/tap-ambiguous-directive.sh | 2 +- t/tap-autonumber.sh | 2 +- t/tap-bailout-and-logging.sh | 2 +- t/tap-bailout-leading-space.sh | 2 +- t/tap-bailout-suppress-badexit.sh | 2 +- t/tap-bailout-suppress-later-diagnostic.sh | 2 +- t/tap-bailout-suppress-later-errors.sh | 2 +- t/tap-bailout.sh | 2 +- t/tap-color.sh | 2 +- t/tap-deps.sh | 2 +- t/tap-diagnostic.sh | 2 +- t/tap-empty-diagnostic.sh | 2 +- t/tap-empty.sh | 2 +- t/tap-escape-directive-2.sh | 2 +- t/tap-escape-directive.sh | 2 +- t/tap-exit.sh | 2 +- t/tap-fancy.sh | 2 +- t/tap-fancy2.sh | 2 +- t/tap-global-log.sh | 2 +- t/tap-global-result.sh | 2 +- t/tap-log.sh | 2 +- t/tap-merge-stdout-stderr.sh | 2 +- t/tap-missing-plan-and-bad-exit.sh | 2 +- t/tap-msg0-bailout.sh | 2 +- t/tap-msg0-directive.sh | 2 +- t/tap-msg0-misc.sh | 2 +- t/tap-msg0-planskip.sh | 2 +- t/tap-msg0-result.sh | 2 +- t/tap-negative-numbers.sh | 2 +- t/tap-no-disable-hard-error.sh | 2 +- t/tap-no-merge-stdout-stderr.sh | 2 +- t/tap-no-spurious-numbers.sh | 2 +- t/tap-no-spurious-summary.sh | 2 +- t/tap-no-spurious.sh | 2 +- t/tap-not-ok-skip.sh | 2 +- t/tap-number-wordboundary.sh | 2 +- t/tap-numbers-leading-zero.sh | 2 +- t/tap-numeric-description.sh | 2 +- t/tap-out-of-order.sh | 2 +- t/tap-passthrough-exit.sh | 2 +- t/tap-passthrough.sh | 2 +- t/tap-plan-corner.sh | 2 +- t/tap-plan-errors.sh | 2 +- t/tap-plan-leading-zero.sh | 2 +- t/tap-plan-malformed.sh | 2 +- t/tap-plan-middle.sh | 2 +- t/tap-plan-whitespace.sh | 2 +- t/tap-plan.sh | 2 +- t/tap-planskip-and-logging.sh | 2 +- t/tap-planskip-badexit.sh | 2 +- t/tap-planskip-bailout.sh | 2 +- t/tap-planskip-case-insensitive.sh | 2 +- t/tap-planskip-late.sh | 2 +- t/tap-planskip-later-errors.sh | 2 +- t/tap-planskip-unplanned-corner.sh | 2 +- t/tap-planskip-unplanned.sh | 2 +- t/tap-planskip-whitespace.sh | 2 +- t/tap-planskip.sh | 2 +- t/tap-realtime.sh | 2 +- t/tap-recheck-logs.sh | 2 +- t/tap-result-comment.sh | 2 +- t/tap-summary-color.sh | 2 +- t/tap-summary.sh | 2 +- t/tap-test-number-0.sh | 2 +- t/tap-todo-skip-together.sh | 2 +- t/tap-todo-skip-whitespace.sh | 2 +- t/tap-todo-skip.sh | 2 +- t/tap-unplanned.sh | 2 +- t/tap-whitespace-normalization.sh | 2 +- t/tap-with-and-without-number.sh | 2 +- t/tap-xfail-tests.sh | 2 +- t/testsuite-summary-color.sh | 2 +- t/testsuite-summary-count.sh | 2 +- 74 files changed, 74 insertions(+), 74 deletions(-) diff --git a/defs b/defs index f69b780..01e90b8 100644 --- 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 74f258f..aaf2cd0 100755 --- 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 abc4ec8..876245e 100755 --- 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 5b49c33..f87ccb3 100755 --- 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 d0d3096..dfbadba 100755 --- 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 c83ba8a..7cd5458 100755 --- 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 69ac88f..54e21fd 100755 --- 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 cd9aa14..bd90f8d 100755 --- 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 91dfd24..08f12fd 100755 --- 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 2fa45d1..a3fab2f 100755 --- 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 ee76e93..8e84a63 100755 --- 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 10b4f5b..fc00af9 100755 --- 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 c92a152..ae0deef 100755 --- 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 976656d..e3d400c 100755 --- 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 3080663..49c6398 100755 --- 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 2fb1ad9..9b59c3d 100755 --- 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 0949384..c9a9823 100755 --- 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 f879cce..9ca5021 100755 --- 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 88ef412..d69cf50 100755 --- 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 85db2cb..31e1ccb 100755 --- 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 ba232c3..528c7bb 100755 --- 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 32cb475..2e92f21 100755 --- 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 1fe4b85..b13d41d 100755 --- 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 ddd74c8..06a6f88 100755 --- 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 cf8918c..bdda865 100755 --- 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 9859e72..9be3816 100755 --- 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 166b785..d7751d7 100755 --- 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 7602aff..24e569c 100755 --- 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 a1174bc..f55b055 100755 --- 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 765442a..fbf54be 100755 --- 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 e9a1091..dc4cad3 100755 --- 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 e82b26b..f101315 100755 --- 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 3f99498..81104af 100755 --- 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 85e1bba..13c577c 100755 --- 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 ebb58cf..bc98a09 100755 --- 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 f73bb03..bbb9a03 100755 --- 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 219a159..2d15121 100755 --- 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 fd1c3b6..620addf 100755 --- 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 60292a7..61bc252 100755 --- 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 e884a1e..ff0e806 100755 --- 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 7b800d5..f6507e0 100755 --- 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 993e750..e2eae17 100755 --- 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 86ba401..8fc0c7e 100755 --- 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 21fd013..4b6a410 100755 --- 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 84047a6..dc1923c 100755 --- 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 68a0f47..cf43d47 100755 --- 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 77f16a7..971869b 100755 --- 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 106cad0..5cc198f 100755 --- 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 40fc8c3..d222870 100755 --- 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 7c1e017..33e5f7f 100755 --- 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 1b20864..0bcc7e3 100755 --- 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 255443d..6558a69 100755 --- 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 a67712b..ece3b25 100755 --- 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 af33733..678bd19 100755 --- 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 3a403c7..c840044 100755 --- 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 2ce4686..ef9ab3c 100755 --- 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 01e5895..5fa8ca5 100755 --- 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 d9c5496..5ae9d3a 100755 --- 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 9e6704b..76a7244 100755 --- 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 ecd3bef..92d7831 100755 --- 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 e774f73..1b7597e 100755 --- 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 4290751..714f328 100755 --- 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 8f533b4..c84e848 100755 --- 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 846239c..6e0e798 100755 --- 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 c085da0..f360349 100755 --- 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 b54013a..dc9e160 100755 --- 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 b9c8825..b979c8b 100755 --- 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 81a8128..c4e47cf 100755 --- 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 e00e4b8..75ad7bf 100755 --- 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 2b1f627..0cbf90b 100755 --- 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 c69a40a..6d69eb6 100755 --- 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 aa86dca..94ae1c9 100755 --- 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 e1a7471..a0effd6 100755 --- 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 a6e5462..47bb663 100755 --- 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 -- 1.7.12.rc0