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 /contrib | |
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 'contrib')
-rwxr-xr-x | contrib/t/help-multilib.sh | 2 | ||||
-rwxr-xr-x | contrib/t/multilib.sh | 2 | ||||
-rwxr-xr-x | contrib/t/parallel-tests-html-recursive.sh | 2 | ||||
-rwxr-xr-x | contrib/t/parallel-tests-html.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/t/help-multilib.sh b/contrib/t/help-multilib.sh index 3e89bbe6a..7973d92cc 100755 --- a/contrib/t/help-multilib.sh +++ b/contrib/t/help-multilib.sh @@ -17,7 +17,7 @@ # Make sure that our macro 'AM_ENABLE_MULTILIB' adds proper text to # the configure help screen. -. ./defs || exit 1 +. test-init.sh cat > configure.ac <<END AC_INIT([$me], [1.0]) diff --git a/contrib/t/multilib.sh b/contrib/t/multilib.sh index fef1ec2ab..bfcdb530b 100755 --- a/contrib/t/multilib.sh +++ b/contrib/t/multilib.sh @@ -18,7 +18,7 @@ # Based on a test case from Ralf Corsepius. required='gcc GNUmake' -. ./defs || exit 1 +. test-init.sh mldir=$am_top_srcdir/contrib/multilib mkdir m4 diff --git a/contrib/t/parallel-tests-html-recursive.sh b/contrib/t/parallel-tests-html-recursive.sh index 12d967ecf..8d038ef91 100755 --- a/contrib/t/parallel-tests-html-recursive.sh +++ b/contrib/t/parallel-tests-html-recursive.sh @@ -16,7 +16,7 @@ # Recursive use of 'check-html'. See Automake bug#11287. -. ./defs || exit 1 +. test-init.sh # Try the variants that are tried in check-html.am. while :; do diff --git a/contrib/t/parallel-tests-html.sh b/contrib/t/parallel-tests-html.sh index e7abc6637..120cb784a 100755 --- a/contrib/t/parallel-tests-html.sh +++ b/contrib/t/parallel-tests-html.sh @@ -18,7 +18,7 @@ # - check-html # - recheck-html -. ./defs || exit 1 +. test-init.sh # Try the variants that are tried in check-html.am. while :; do |