diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-24 10:36:15 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-25 10:29:43 +0200 |
commit | c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336 (patch) | |
tree | 1e2115c0d24da906daa64cc84d853e538129574f /t/tap-recheck-logs.sh | |
parent | aa630a928a586fd8dc8a087337c3462d7f4fd1c6 (diff) | |
download | automake-c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336.tar.gz |
tests: simpler workaround for shells losing the exit status in exit trap
Now that we can assume our tests are run by a decent POSIX shell, we
can simplify our workaround aimed at having the exit status propagated
correctly to the code in the exit trap. Unfortunately, we cannot
dispense with such a workaround altogether, because it's still required
by some shells we need to support (at least Solaris 10 /bin/ksh and
/usr/xpg4/bin/sh).
For more information about the need of that workaround, see the entry
about 'trap' in the section "Limitations of Shell Builtins" in the
Autoconf manual:
<http://www.gnu.org/software/autoconf/manual/autoconf.html#trap>
The new workaround has been tested successfully with the following
shells:
- Bash 4.1
- Bash 3.2
- Bash 3.0
- Bash 2.05b
- dash 0.5.5.1
- dash 0.5.2
- AT&T Ksh 93u (from official Debian package)
- MirBSD Korn Shell 40.2 (from official Debian package)
- Solaris 9, 10 and 11 /bin/ksh
- Solaris 9, 10 and 11 /usr/xpg4/bin/sh
- NetBSD 5.1 /bin/sh
- NetBSD 5.1 /bin/ksh
* t/ax/test-init.sh (Exit): Rename ...
(_am_exit): ... like this.
(exit): New alias for '_am_exit'. We cannot simply redefine 'exit'
as a shell function, because some shells (dash 0.5.5.1, Solaris 10
/bin/ksh and /usr/xpg4/bin/sh) do not allow it.
(_am_exit, trap): Add extra escaping for 'exit' calls, to ensure we
really invoke the 'exit' builtin and not our alias with the same
name.
* configure.ac: Check that the shell selected to run our testsuite
supports aliases named like shell builtins.
* t/REAMDE: Adjust.
* All tests: Adjust, by simply using 'exit' instead of 'Exit'.
* t/self-check-explicit-skips.sh: Adjust: the first usage of 'exit'
after it has been redefined as an alias must be on a new line w.r.t.
that where the alias is defined, in order for the redefinition to be
honored.
* syntax-checks.mk (sc_tests_Exit_not_exit): Delete.
(sc_tests_exit_not_Exit): New.
(syntax_check_rules): Adjust.
(sc_tests_automake_fails): Simplify the recipe a little.
* Several tests: Remove now useless spurious quoting once required
to placate the 'sc_tests_Exit_not_exit' maintainer check.
* gen-testsuite-part: Likewise. Also, avoid uses of 'Exit' in the
generated scripts.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/tap-recheck-logs.sh')
-rwxr-xr-x | t/tap-recheck-logs.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/t/tap-recheck-logs.sh b/t/tap-recheck-logs.sh index 7fb2b807f..e774f7310 100755 --- a/t/tap-recheck-logs.sh +++ b/t/tap-recheck-logs.sh @@ -17,7 +17,7 @@ # TAP support: # - RECHECK_LOGS -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' TEST_LOG_COMPILER = cat @@ -58,21 +58,21 @@ grep_summary () grep '^# ERROR: *1$' stdout } -$MAKE -e check && Exit 1 +$MAKE -e check && exit 1 test -f foo.log test -f bar.log test -f baz.log rm -f foo.log bar.log -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; exit 1; } cat stdout test -f foo.log test -f bar.log grep '^PASS: foo\.test 1$' stdout grep '^PASS: foo\.test 2$' stdout grep '^FAIL: bar\.test 1$' stdout -grep 'baz\.test' stdout && Exit 1 +grep 'baz\.test' stdout && exit 1 grep_summary $sleep @@ -80,38 +80,38 @@ touch foo.test # We re-run only a successful test, but the tests that failed in the # previous run should still be taken into account, and cause an overall # failure. -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; exit 1; } cat stdout grep '^PASS: foo\.test 1$' stdout grep '^PASS: foo\.test 2$' stdout -grep 'ba[rz]\.test' stdout && Exit 1 +grep 'ba[rz]\.test' stdout && exit 1 is_newest foo.log foo.test grep_summary $sleep touch zardoz -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; exit 1; } cat stdout grep '^ERROR: baz\.test' stdout -$EGREP '(foo|bar)\.test' stdout && Exit 1 +$EGREP '(foo|bar)\.test' stdout && exit 1 is_newest baz.log zardoz grep_summary # Now, explicitly retry with all test logs already updated, and ensure # that the summary is still displayed. -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; exit 1; } cat stdout -$EGREP '(foo|bar|baz)\.test' stdout && Exit 1 +$EGREP '(foo|bar|baz)\.test' stdout && exit 1 grep_summary # The following should re-run foo.test (and only foo.test), even if its # log file is up-to-date. : > older -env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; exit 1; } cat stdout grep '^PASS: foo\.test 1$' stdout grep '^PASS: foo\.test 2$' stdout -grep 'ba[rz]\.test' stdout && Exit 1 +grep 'ba[rz]\.test' stdout && exit 1 is_newest foo.log older grep_summary |