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 114 115 116 117 118 119 120 121
#! /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/>.
# An empty "foo_PRIMARY" declaration should *not* cause "make install"
# to create directory $(foodir). See automake bug#10997 and bug#11030.
. ./defs || exit 1
cat >> configure.ac <<'END'
AC_SUBST([CC], [whatever])
AC_SUBST([JAVAC], [whatever])
AM_PATH_PYTHON(,,:)
AC_OUTPUT
END
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = no-dependencies
mydir = $(prefix)/my
myexecdir = $(prefix)/myexec
javadir = $(prefix)/java
END
# Write Makefile.am.
{
for dir in sbin bin libexec pkglibexec myexec; do
for dst in '' dist_ nodist_; do
echo "${dst}${dir}_SCRIPTS ="
done
echo "${dir}_PROGRAMS ="
done
for dir in lib pkglib myexec my; do
echo "${dir}_LIBRARIES ="
echo "${dir}_LTLIBRARIES ="
done
for p1 in '' notrans_; do
for p2 in '' dist_ nodist_; do
for s in '' 1 2 3 4 5 6 7 8 9; do
echo "${p1}${p2}man${s}_MANS ="
done
done
done
for dst in '' dist_ nodist_; do
for dir in dataroot data pkgdata doc lisp my; do
echo "${dst}${dir}_DATA ="
done
for dir in include pkginclude oldinclude my; do
echo "${dst}${dir}_HEADERS ="
done
for dir in python my; do
echo "${dst}${dir}_PYTHON ="
done
for dir in info my; do
echo "${dst}${dir}_TEXINFOS ="
done
for dir in java my; do
echo "${dst}${dir}_JAVA ="
done
for dir in lisp my; do
echo "${dst}${dir}_LISP ="
done
done
} > t
cat t >> Makefile.am
sed 's/^/nobase_/' t >> Makefile.am
rm -f t
cat Makefile.am # For debugging.
# Sanity check.
grep '^oldinclude_HEADERS =' Makefile.am \
&& grep '^nodist_my_PYTHON =' Makefile.am \
&& grep '^notrans_dist_man5_MANS =' Makefile.am \
|| fatal_ "creating Makefile.am"
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
cwd=$(pwd) || fatal_ "getting current working directory"
doinst ()
{
$MAKE install install-pdf install-ps install-dvi ${1+"$@"}
}
: > foo.sh
./configure --prefix="$cwd/inst"
doinst
test ! -d inst || { find inst; exit 1; }
$MAKE uninstall
doinst bin_SCRIPTS=foo.sh AM_MAKEFLAGS='bin_SCRIPTS=foo.sh'
test -f inst/bin/foo.sh
./configure
doinst DESTDIR="$cwd/dest"
test ! -d dest || { find dest; exit 1; }
$MAKE uninstall
doinst DESTDIR="$cwd/dest" bin_SCRIPTS=foo.sh AM_MAKEFLAGS='bin_SCRIPTS=foo.sh'
test -f dest/usr/local/bin/foo.sh
: