From c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 24 Jun 2012 10:36:15 +0200 Subject: 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: 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 --- t/test-trs-recover.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 't/test-trs-recover.sh') diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh index a1321944d..9247b1e31 100755 --- a/t/test-trs-recover.sh +++ b/t/test-trs-recover.sh @@ -19,7 +19,7 @@ # This test is complex and tricky, but that's acceptable since we are # testing semantics that are potentially complex and tricky. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <stdout || { cat stdout; Exit 1; } +TEST_STATUS=1 $MAKE bar.trs baz.trs >stdout || { cat stdout; exit 1; } cat stdout test ! -f foo.trs test -f bar.trs test -f baz.trs grep '^FAIL: bar\.test' stdout -$EGREP '^(baz|foo)\.test' stdout && Exit 1 +$EGREP '^(baz|foo)\.test' stdout && exit 1 : Recreate with a sweeping "make check", and ensure that also up-to-date : '.trs' files are remade. @@ -87,7 +87,7 @@ is_newest baz.trs stamp : ensure that also up-to-date '.trs' files are remade -- this time we : grep the "make check" output verify that. rm -f foo.trs bar.trs -TEST_STATUS=1 $MAKE check >stdout && { cat stdout; Exit 1; } +TEST_STATUS=1 $MAKE check >stdout && { cat stdout; exit 1; } test -f foo.trs test -f bar.trs grep '^FAIL: foo\.test' stdout @@ -110,7 +110,7 @@ test ! -f baz.trs : Interactions with "make recheck" are OK. rm -f foo.trs bar.trs baz.log baz.trs -$MAKE recheck >stdout || { cat stdout; Exit 1; } +$MAKE recheck >stdout || { cat stdout; exit 1; } cat stdout test -f foo.trs test -f bar.trs @@ -118,7 +118,7 @@ test ! -f baz.trs test ! -f baz.log grep '^PASS: foo\.test' stdout grep '^PASS: bar\.test' stdout -grep 'baz\.test' stdout && Exit 1 +grep 'baz\.test' stdout && exit 1 count_test_results total=2 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=0 : Setup for the next check. @@ -131,11 +131,11 @@ test -f baz.trs : '.trs' files are *not* remade. update_stamp rm -f foo.trs bar.trs test-suite.log -$MAKE test-suite.log >stdout || { cat stdout; Exit 1; } +$MAKE test-suite.log >stdout || { cat stdout; exit 1; } cat stdout grep '^PASS: foo\.test' stdout grep '^PASS: bar\.test' stdout -grep 'baz\.test' stdout && Exit 1 +grep 'baz\.test' stdout && exit 1 stat *.trs *.log stamp || : # For debugging. # Check that make has updated what it needed to, but no more. test -f foo.trs @@ -153,7 +153,7 @@ test -f baz.trs rm -f foo.trs update_stamp touch bar.test -RECHECK_LOGS= $MAKE -e check >stdout || { cat stdout; Exit 1; } +RECHECK_LOGS= $MAKE -e check >stdout || { cat stdout; exit 1; } cat stdout # Check that make has updated what it needed to, but no more. test -f foo.trs @@ -161,6 +161,6 @@ is_newest bar.trs bar.test is_newest stamp baz.trs grep '^PASS: foo\.test' stdout grep '^PASS: bar\.test' stdout -grep 'baz\.test' stdout && Exit 1 +grep 'baz\.test' stdout && exit 1 : -- cgit v1.2.1