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/silent-nested-vars.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/silent-nested-vars.sh')
-rwxr-xr-x | t/silent-nested-vars.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh index c579e2cd7..08ba070ae 100755 --- a/t/silent-nested-vars.sh +++ b/t/silent-nested-vars.sh @@ -17,7 +17,7 @@ # Check silent-rules mode, on 'make' implementations that do not # support nested variables (Bug#9928, Bug#10237). -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' AM_SILENT_RULES @@ -96,31 +96,31 @@ a = $(b$(c)) all: touch bar END -$MAKE && Exit 99 +$MAKE && exit 99 mv -f Makefile foo.mk -$MAKE -f foo.mk && Exit 99 -cat foo.mk | $MAKE -f - && Exit 99 -test -f bar && Exit 99 +$MAKE -f foo.mk && exit 99 +cat foo.mk | $MAKE -f - && exit 99 +test -f bar && exit 99 sed '/a =/d' foo.mk > Makefile -$MAKE && test -f bar || Exit 99 +$MAKE && test -f bar || exit 99 rm -f bar Makefile foo.mk $ACLOCAL $AUTOMAKE --add-missing $AUTOCONF -./configure --enable-silent-rules >stdout || { cat stdout; Exit 1; } +./configure --enable-silent-rules >stdout || { cat stdout; exit 1; } cat stdout grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \ stdout $EGREP 'CC|AM_V|GEN' Makefile # For debugging. grep '^AM_V_CC = *\$(am__v_CC_0) *$' Makefile grep '^AM_V_GEN = *\$(am__v_GEN_0) *$' Makefile -$MAKE >stdout || { cat stdout; Exit 1; } +$MAKE >stdout || { cat stdout; exit 1; } cat stdout -$EGREP ' (-c|-o)' stdout && Exit 1 -grep 'mv ' stdout && Exit 1 -grep 'echo .*oop' stdout && Exit 1 +$EGREP ' (-c|-o)' stdout && exit 1 +grep 'mv ' stdout && exit 1 +grep 'echo .*oop' stdout && exit 1 grep 'CC .*foo\.' stdout grep 'CC .*bar\.' stdout grep 'CCLD .*foo' stdout @@ -128,7 +128,7 @@ grep 'CCLD .*bar' stdout grep 'PKG-GEN .*oop' stdout $MAKE distclean -./configure --disable-silent-rules > stdout || { cat stdout; Exit 1; } +./configure --disable-silent-rules > stdout || { cat stdout; exit 1; } cat stdout grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \ stdout @@ -136,12 +136,12 @@ $EGREP 'CC|AM_V|GEN' Makefile # For debugging. grep '^AM_V_CC = *\$(am__v_CC_1) *$' Makefile grep '^AM_V_GEN = *\$(am__v_GEN_1) *$' Makefile -$MAKE >stdout || { cat stdout; Exit 1; } +$MAKE >stdout || { cat stdout; exit 1; } cat stdout grep ' -c' stdout grep ' -o foo' stdout grep ' -o bar' stdout grep 'echo .*>oop' stdout -$EGREP '(CC|LD) ' stdout && Exit 1 +$EGREP '(CC|LD) ' stdout && exit 1 : |