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
#! /bin/sh
# Copyright (C) 2001-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/>.
# Test that installing under $exec_prefix is handled by install-exec.
# Testing with headers for instance.
. ./defs || exit 1
cat >Makefile.am << 'EOF'
# User directories.
inclexecdir = $(exec_prefix)/include
inclexec_HEADERS = my-config.h
incldatadir = $(prefix)/include
incldata_HEADERS = my-data.h
## Standard directories: _DATA
## Commented out are invalid combinations.
##bin_DATA = data
##sbin_DATA = data
##libexec_DATA = data
data_DATA = data
sysconf_DATA = data
localstate_DATA = data
##lib_DATA = data
##info_DATA = data
##man_DATA = data
##include_DATA = data
##oldinclude_DATA = data
pkgdata_DATA = data
##pkglib_DATA = data
##pkginclude_DATA = data
## Standard directories: _SCRIPTS
## Commented out are invalid combinations.
bin_SCRIPTS = script
sbin_SCRIPTS = script
libexec_SCRIPTS = script
##data_SCRIPTS = script
##sysconf_SCRIPTS = script
##localstate_SCRIPTS = script
##lib_SCRIPTS = script
##info_SCRIPTS = script
##man_SCRIPTS = script
##include_SCRIPTS = script
##oldinclude_SCRIPTS = script
pkgdata_SCRIPTS = script
##pkglib_SCRIPTS = script
##pkginclude_SCRIPTS = script
EOF
$ACLOCAL || exit 1
$AUTOMAKE
# install-SCRIPTS targets.
sed -n '/^install-data-am/,/^ /p' Makefile.in > produced
cat > expected <<'EOF'
install-data-am: install-dataDATA install-incldataHEADERS \
install-pkgdataDATA install-pkgdataSCRIPTS
EOF
diff expected produced
# install-exec targets.
sed -n '/^install-exec-am/,/^ /p' Makefile.in > produced
cat > expected <<'EOF'
install-exec-am: install-binSCRIPTS install-inclexecHEADERS \
install-libexecSCRIPTS install-localstateDATA \
EOF
diff expected produced
exit 0