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
#! /bin/sh
# Copyright (C) 2011-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/>.
# Files specified by AC_REQUIRE_AUX_FILE must exist, and they get
# automatically distributed by the top-level Makefile.am.
# Automake bug#9651 reported that this didn't happen when the build-aux
# directory was set to '.' by AC_CONFIG_AUX_DIR.
am_create_testdir=empty
. ./defs || exit 1
i=0
for auxdir in build-aux ''; do
echo "*** Testing with auxdir '$auxdir' ***"
i=$(($i + 1))
mkdir T$i.d
cd T$i.d
unindent > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([${auxdir:-.}])
AM_INIT_AUTOMAKE
AC_REQUIRE_AUX_FILE([foo.txt])
AC_REQUIRE_AUX_FILE([bar.sh])
AC_REQUIRE_AUX_FILE([zardoz])
AC_CONFIG_FILES([Makefile subdir/Makefile])
AC_OUTPUT
END
echo auxdir = ${auxdir:+"$auxdir/"} > Makefile.am
unindent >> Makefile.am <<'END'
SUBDIRS = subdir
test: distdir
ls -l $(distdir) $(distdir)/* ;: For debugging.
@echo DIST_COMMON = $(DIST_COMMON) ;: Likewise.
echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)foo.txt '
echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)bar.sh '
echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)zardoz '
test -f $(distdir)/$(auxdir)foo.txt
test -f $(distdir)/$(auxdir)bar.sh
test -f $(distdir)/$(auxdir)zardoz
.PHONY: test
check-local: test
END
mkdir subdir
echo > subdir/Makefile.am # 'echo', not ':', for Solaris /bin/sh.
test -z "$auxdir" || mkdir "$auxdir" || exit 99
if test -z "$auxdir"; then
auxdir=.
auxdir_rx='\.'
else
auxdir_rx=$auxdir
fi
$ACLOCAL
$AUTOCONF
AUTOMAKE_fails
grep "^configure\\.ac:4:.* required file.*$auxdir_rx/foo\\.txt" stderr
grep "^configure\\.ac:5:.* required file.*$auxdir_rx/bar\\.sh" stderr
grep "^configure\\.ac:6:.* required file.*$auxdir_rx/zardoz" stderr
touch $auxdir/foo.txt $auxdir/bar.sh $auxdir/zardoz
cp "$am_scriptdir"/missing "$am_scriptdir"/install-sh $auxdir \
|| fatal_ "fetching auxiliary scripts 'missing' and 'install-sh'"
$AUTOMAKE
./configure
$MAKE test
$EGREP '(foo\.txt|bar\.sh|zardoz)' subdir/Makefile.in && exit 1
$MAKE distcheck
cd ..
done
: