diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-27 16:41:39 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-27 16:44:28 +0200 |
commit | 5ddf10071d94acf2ae0e69e187641f22cce0199a (patch) | |
tree | 94029981e22ecf064ed4a18051ce4c80771226f1 /t/self-check-explicit-skips.sh | |
parent | f897907bee30ec66fdebfe04d3c2d6ad8b8da501 (diff) | |
download | automake-5ddf10071d94acf2ae0e69e187641f22cce0199a.tar.gz |
tests: prefer including 'test-init.sh' rather than './defs'
This is a follow-up to today's commit v1.12.4-22-g0610fc8,
"tests: prepare to move ./defs to t/ax/test-init.sh"
* All tests: To run the common setup, use the command:
. test-init.sh
instead of the older, "historical" one:
. ./defs || exit 1
Note that the "|| exit 1" wasn't really useful, since the 'errexit'
shell flag is in effect in both './defs' and 'test-init.sh', and all
the known shells that are good enough to run the automake testsuite
do automatically exit with error when a sourced file cannot be found
(at least, they do so in non-interactive mode, which is the only
mode that concerns us in the testsuite).
* t/ax/tap-summary-aux.sh, t/ax/testsuite-summary-checks.sh: Likewise.
* gen-testsuite-part: Do the same in the generated tests.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/self-check-explicit-skips.sh')
-rwxr-xr-x | t/self-check-explicit-skips.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh index 97f5288fd..aa9250463 100755 --- a/t/self-check-explicit-skips.sh +++ b/t/self-check-explicit-skips.sh @@ -19,7 +19,7 @@ # an early exit due to some command exiting unexpectedly with status 77. am_create_testdir=no -. ./defs || exit 1 +. test-init.sh set +e @@ -31,7 +31,7 @@ run_dummy_test () { env $2 $AM_TEST_RUNNER_SHELL -c " am_create_testdir=no - . ./defs + . test-init.sh $1 " dummy.sh } |