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/distcheck-missing-m4.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/distcheck-missing-m4.sh')
-rwxr-xr-x | t/distcheck-missing-m4.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh index 051e52d14..1eef8720d 100755 --- a/t/distcheck-missing-m4.sh +++ b/t/distcheck-missing-m4.sh @@ -18,7 +18,7 @@ # missing from the dist tarball (interaction with '--install'). # See automake bug#9037. -. ./defs || Exit 1 +. ./defs || exit 1 cwd=$(pwd) || fatal_ "cannot get current working directory" @@ -60,21 +60,21 @@ ACLOCAL_PATH=$cwd/pth; export ACLOCAL_PATH # We don't use '--install' here. Our distcheck-hook should catch this. $ACLOCAL -I m4 $AUTOCONF -$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && Exit 1 # Sanity check. +$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && exit 1 # Sanity check. $AUTOMAKE check_no_spurious_error () { - $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1 + $EGREP -i 'mkdir:|:.*(permission|denied)' output && exit 1 # On failure, some make implementations (such as Solaris make) print the # whole failed recipe on stdout. The first grep works around this. - grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1 + grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && exit 1 : To placate 'set -e'. } ./configure -$MAKE distcheck >output 2>&1 && { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 && { cat output; exit 1; } cat output for x in bar baz zar; do $EGREP "required m4 file.*not distributed.* $x.m4( |$)" output @@ -98,15 +98,15 @@ MY_BLA END $MAKE -$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && Exit 1 # Sanity check. +$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && exit 1 # Sanity check. -$MAKE distcheck >output 2>&1 && { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 && { cat output; exit 1; } cat output $EGREP "required m4 file.*not distributed.* qux.m4( |$)" output $EGREP "required m4 file.*not distributed.* bla.m4( |$)" output check_no_spurious_error # Check that we don't complain for files that should have been found. -$FGREP " (bar|baz|zar).m4" output && Exit 1 +$FGREP " (bar|baz|zar).m4" output && exit 1 # Now we again use '--install', and "make distcheck" should pass. $ACLOCAL -I m4 --install |