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
#! /bin/sh
# Copyright (C) 2009-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 cscope functionality.
. ./defs || exit 1
plan_ 18
ocwd=$(pwd) || fatal_ "getting top-level directory"
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_SUBST([CC], [who-cares])
AC_SUBST([CXX], [who-cares])
AC_SUBST([FC], [who-cares])
AC_SUBST([GCJ], [who-cares])
AM_PATH_LISPDIR
AC_OUTPUT
END
mkdir sub sub/subsub
cat > Makefile.am <<'END'
SUBDIRS = sub
bin_PROGRAMS = foo
foo_SOURCES = foo.c bar.cpp baz.f90
lisp_LISP = foo.el
EXTRA_DIST = foo.el
END
cat > sub/Makefile.am <<'END'
bin_PROGRAMS = bar
bar_SOURCES = subsub/dist.c
nodist_bar_SOURCES = subsub/gen.c
subsub/gen.c:
$(MKDIR_P) subsub
echo 'int generated_subsub () { return 0; }' > $@
CLEANFILES = subsub/gen.c
END
echo 'int foo_func () { return 0; }' > foo.c
echo 'int main () { return 0; }' > bar.cpp
cat > baz.f90 <<'END'
subroutine baz
end
END
: > foo.el
echo 'int main () { return 0; }' > sub/subsub/dist.c
$ACLOCAL || fatal_ "aclocal failed"
$AUTOCONF || fatal_ "autoconf failed"
$AUTOMAKE -i -a || fatal_ "automake -i -a failed"
# Sun cscope is interactive without redirection; also, it might not
# support the '-q' option, which is required by our generated recipes.
if cscope -q --version </dev/null; then
have_cscope=yes
else
have_cscope=no
fi
test_cleanup ()
{
r=ok
if test -f configure; then
# In-tree build.
$MAKE distclean
else
# VPATH build.
$MAKE distcleancheck
fi \
&& test ! -f cscope.files \
&& test ! -f cscope.out \
&& test ! -f cscope.in.out \
&& test ! -f cscope.po.out \
|| r='not ok'
result_ "$r" "[$pfx] make distcheck"
}
test_cscope ()
{
r=ok
$MAKE -n cscope || r='not ok'
result_ "$r" "[$pfx] make -n cscope"
if test $have_cscope = no; then
# For later tests.
touch cscope.files cscope.out cscope.in.out cscope.po.out
skip_row_ 3 -r "no proper cscope program available"
return 0
fi
r=ok
$MAKE cscope 2>stderr || r='not ok'
cat stderr >&2
grep 'cannot find file' stderr && r='not ok'
rm -f stderr
result_ "$r" "[$pfx] make cscope"
r=ok
test -f cscope.files \
&& $FGREP foo.c cscope.files \
&& $FGREP bar.cpp cscope.files \
&& $FGREP sub/subsub/dist.c cscope.files \
&& $FGREP sub/subsub/gen.c cscope.files \
|| r='not ok'
result_ "$r" "[$pfx] cscope.files looks correct"
r=ok
# cscope.files might not exist of the earlier "make cscope" failed.
cp cscope.files cscope.files1 \
&& $MAKE cscope \
&& diff cscope.files cscope.files1 \
|| r='not ok'
rm -f cscope.files1
result_ "$r" "[$pfx] second \"make cscope\" is consistent"
}
my_configure ()
{
command_ok_ "[$pfx] configure" \
"$1"/configure EMACS=no --with-lispdir=/who/cares
}
if using_gmake; then
cd "$ocwd"
pfx="relative VPATH"
mkdir build
cd build
my_configure ..
test_cscope
test_cleanup
cd "$ocwd"
pfx="absolute VPATH"
mkdir build2
cd build2
my_configure "$ocwd"
test_cscope
test_cleanup
else
skip_row_ 12 -r "cscope in VPATH required GNU make"
fi
cd "$ocwd"
pfx="in-tree build"
my_configure .
test_cscope
test_cleanup
: