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/distlinksbrk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/distlinksbrk.sh') diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh index cf0556e93..9f537681f 100755 --- a/t/distlinksbrk.sh +++ b/t/distlinksbrk.sh @@ -17,7 +17,7 @@ # Check that distributed broken symlinks cause 'make dist' to fail, and # to do so with (mostly) meaningful diagnostic. -. ./defs || Exit 1 +. ./defs || exit 1 # We need, for our broken symlinks, names that make it hard to get false # positives when grepping make output to look for them. @@ -60,7 +60,7 @@ for lnk in $lnk1 $lnk2 $lnka $lnkb; do $AUTOMAKE ./configure # Distribution must fail, with a decent error message. - $MAKE distdir >out 2>&1 && { cat out; Exit 1; } + $MAKE distdir >out 2>&1 && { cat out; exit 1; } cat out $FGREP $lnk out done -- cgit v1.2.1