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 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194
#! /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/>.
# Not all primaries/directories combinations are valid.
# Automake should flag them as errors.
# Originated from PR/294, extended later (following bug #7647) to
# cover more cases.
# See also test 'primary-prefix-valid-couples.test'.
. ./defs || exit 1
plan_ "later"
oIFS=$IFS # Saved for later.
: > ar-lib
: > ltmain.sh
: > texinfo.tex
: > elisp-comp
: > py-compile
: > config.guess
: > config.sub
cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
AC_SUBST([LIBTOOL], [:]) dnl So that we don't have to require Libtool.
AM_PROG_GCJ
AM_PATH_PYTHON
AM_PATH_LISPDIR
END
$ACLOCAL || fatal_ "aclocal failure"
# Please keep this list in sync with the list of "Directory Variables"
# in the GNU Coding Standards and with the list additional directory
# variables provided by autoconf and/or automake (pkgdatadir, pkglibdir,
# ...). See also the hash '%standard_prefix' in the automake script.
prefixes='bin data dataroot doc dvi exec html include info lib libexec
lisp locale localstate man man1 man2 man3 man4 man5 man6 man7
man8 man9 oldinclude pdf pkgdata pkginclude pkglib pkglibexec
ps sbin sharedstate sysconf'
# Please keep this list in sync with the list of primaries documented in
# the Automake manual (see the "The Uniform Naming Scheme" section).
primaries='PROGRAMS LIBRARIES LTLIBRARIES LISP PYTHON JAVA SCRIPTS DATA
HEADERS MANS TEXINFOS'
# Use files, not variables, to hold the list of all the possible
# prefix_PRIMARY couples and the list of those couples valid for
# automake, to avoid having unreadable very verbose traces.
set +x # Don't be overly verbose.
for prefix in $prefixes; do
for primary in $primaries; do
echo ${prefix} ${primary}
done
done >all.list
for primary in $primaries; do
prefixes_ok=''
case $primary in
LIBRARIES|LTLIBRARIES)
prefixes_ok='lib pkglib'
;;
PROGRAMS)
prefixes_ok='bin sbin libexec pkglibexec'
;;
SCRIPTS)
prefixes_ok='bin sbin libexec pkglibexec pkgdata'
;;
DATA)
prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
sysconf sharedstate localstate lisp'
;;
HEADERS)
prefixes_ok='include oldinclude pkginclude'
;;
LISP)
prefixes_ok='lisp'
;;
PYTHON)
prefixes_ok='python'
;;
JAVA)
prefixes_ok='java'
;;
MANS)
# FIXME: Here we'd like to have:
# prefixes_ok='man man1 man2 man3 man4 man5 man6 man7 man8 man9'
# but Automake currently fails on that, as it allows the MANS
# primary to be coupled to any prefix.
# See also Automake bug#7656.
# We should dig out how automake had come to behave this way, and
# if such a behaviour can be safely changed.
prefixes_ok=$prefixes
;;
TEXINFOS)
# FIXME: Here we'd like to have:
# prefixes_ok='info'
# but Automake currently fails on that, as it allows the use of
# 'foo_TEXINFOS' to declare extra Texinfo sources for the 'foo'
# Texinfo manual, as in e.g.:
# info_TEXINFOS = foo.texi
# foo_TEXINFOS = gpl.texi
# See also Automake bug#7657.
prefixes_ok=$prefixes
;;
*)
fatal_ "unrecognized primary '$primary'"
;;
esac
for prefix in $prefixes_ok; do
echo ${prefix}_${primary}
done
done >allow.list
# 'html_TEXINFOS' is not yet supported, and might never be.
grep -v '^html TEXINFOS$' all.list | awk '{print NR, $0}' > t
mv -f t all.list
# For debugging.
echo '=== all.list ==='
cat all.list
echo '=== allow.list ==='
cat allow.list
# Create the Makefile.am.
while read lineno prefix primary; do
test -n "$prefix" && test -n "$primary" && test 0 -lt $lineno \
|| fatal_ "internal error in 'all.list'"
pfx='' ext=''
case $primary in
LTLIBRARIES) pfx=lib ext=la;;
LIBRARIES) pfx=lib ext=a;;
MANS) ext=man;;
HEADERS) ext=h;;
JAVA) ext=java;;
PYTHON) ext=py;;
LISP) ext=el;;
TEXINFOS) ext=texi;;
esac
test -z "$ext" || ext=.$ext
if test $primary = TEXINFOS; then
echo @setfilename foo$lineno.info > foo$lineno.texi
fi
echo ${prefix}_${primary} = ${pfx}foo${lineno}${ext}
done <all.list >Makefile.am
# For debugging.
echo '=== Makefile.am ==='
cat Makefile.am
set -x # Restore shell xtraces from now on.
AUTOMAKE_fails \
-d "'automake -a' error out on mismatched prefix/primary couples" \
-- --add-missing
while read lineno prefix primary; do
test -n "$prefix" && test -n "$primary" && test 0 -lt $lineno \
|| fatal_ "internal error in 'all.list'"
grep "^${prefix}_${primary}$" allow.list >/dev/null && continue
errmsg_rx=".*${prefix}dir.* not a legitimate directory .*$primary"
command_ok_ \
"mismatched prefix/primary in ${prefix}_${primary}" \
grep "^Makefile\\.am:$lineno: $errmsg_rx" stderr
done <all.list
# Check that automake really failed only for the expected reason(s).
grep -v 'dir.* not a legitimate directory' stderr && exit 1
# Check that the same failures are present without the '--add-missing'
# option.
mv stderr stderr.old
AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
command_ok_ "... and with the same diagnostic of 'automake -a'" \
diff stderr.old stderr
: