Hash :
c2a52bf0
Author :
Date :
2012-06-24T10:36:15
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>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
#! /bin/sh
# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check that the new testsuite harness do not generate recipes that can
# have a trailing '\', since that can cause spurious syntax errors with
# older bash versions (e.g., bash 2.05b).
# See automake bug#10436.
. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
TESTS = foo.test
EXTRA_DIST = $(TESTS)
am__backslash = \\ # foo
.PHONY: bad-recipe
bad-recipe:
@printf '%s\n' $(am__backslash)
END
cat > foo.test <<'END'
#!/bin/sh
exit 0
END
chmod +x foo.test
am__SHELL=$SHELL; export am__SHELL
am__PERL=$PERL; export am__PERL
cat > my-shell <<'END'
#!/bin/sh -e
set -u
tab=' '
nl='
'
am__shell_flags=
am__shell_command=; unset am__shell_command
while test $# -gt 0; do
case $1 in
# If the shell is invoked by make e.g. as "sh -ec" (seen on
# GNU make in POSIX mode) or "sh -ce" (seen on Solaris make).
-*c*)
flg=`echo x"$1" | sed -e 's/^x-//' -e 's/c//g'`
if test x"$flg" != x; then
am__shell_flags="$am__shell_flags -$flg"
fi
am__shell_command=$2
shift
;;
-?*)
am__shell_flags="$am__shell_flags $1"
;;
*)
break
;;
esac
shift
done
if test x${am__shell_command+"set"} != x"set"; then
# Some make implementations, like *BSD's, pass the recipes to the shell
# through its standard input. Trying to run our extra checks in this
# case would be too tricky, so we just skip them.
exec $am__SHELL $am__shell_flags ${1+"$@"}
else
am__tweaked_shell_command=`printf '%s\n' "$am__shell_command" \
| tr -d " $tab$nl"`
case ${am__tweaked_shell_command-} in
*\\)
echo "my-shell: recipe ends with backslash character" >&2
printf '%s\n' "=== BEGIN recipe" >&2
printf '%s\n' "${am__shell_command-}" >&2
printf '%s\n' "=== END recipe" >&2
exit 99
;;
esac
exec $am__SHELL $am__shell_flags -c "$am__shell_command" ${1+"$@"}
fi
END
chmod a+x my-shell
cat my-shell
CONFIG_SHELL=$(pwd)/my-shell; export CONFIG_SHELL
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure CONFIG_SHELL="$CONFIG_SHELL"
st=0
$MAKE bad-recipe 2>stderr && st=1
cat stderr >&2
$FGREP "my-shell: recipe ends with backslash character" stderr || st=1
test $st -eq 0 || skip_ "can't catch trailing backslashes in make recipes"
$MAKE check
: