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
#! /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/>.
# TAP support:
# - missing, unreadable, or not-executable test scripts cause proper
# error reports
. ./defs || exit 1
fetch_tap_driver
plan_ 6
cat >> configure.ac <<END
AC_OUTPUT
END
cat > Makefile.am << 'END'
TEST_LOG_DRIVER = $(srcdir)/tap-driver
TESTS = none.test noread.test noexec.test
none.test:
END
cat > noexec.test <<'END'
#!/bin/sh
echo 1..1
echo ok 1
END
cp noexec.test noread.test
chmod a-r noread.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
if $MAKE check >stdout; then
r='not ok'
else
r='ok'
fi
cat stdout
result_ "$r" '"make check" returns non-zero exit status'
# FIXME: maybe grep for stricter error messages in the next checks?
command_ok_ "non-existent test is reported" \
grep '^ERROR: none\.test' stdout
desc="non-executable test is reported"
# Redirect output to avoid confusing automake's testsuite own TAP driver.
if ./noexec.test >/dev/null; then
skip_ -r "any file is executable" "$desc"
else
command_ok_ "$desc" -- grep '^ERROR: noexec\.test' stdout
fi
desc="non-readable test is reported"
if test -r noread.test; then
skip_ -r "any file is readable" "$desc"
else
command_ok_ "$desc" -- grep '^ERROR: noread\.test' stdout
fi
# Check that no spurious test result is reported. This is lower-priority
# (and in fact the check currently fails for our awk-based driver).
directive=
if test $am_tap_implementation = shell; then
directive=TODO
else
# Older versions of IPC::Open3 (e.g., version 1.05 on perl 5.12.4 or
# version 1.0103 on perl 5.6.2) fail to properly trap errors in exec(2)
# calls in the child process; hence, the TAP driver cannot be properly
# informed of such error.
if $PERL -w -e '
use IPC::Open3 qw/open3/;
$@ = "";
eval { open3(*STDIN, *STDOUT, *STDERR, "am--no-such-command") };
$@ =~ m/\bopen3:.*am--no-such-command/
or die "Bad \$@ value: \"$@\"\n";
'; then
: # OK. IPC::Open3 should be good enough.
else
for s in '"missing plan" message' 'results'; do
skip_ -r "IPC::Open3 not good enough" "no spurious $s"
done
exit 0
fi
fi
command_ok_ 'no spurious "missing plan" message' \
-D "$directive" -- not grep 'missing.* plan' stdout
command_ok_ 'no spurious results' \
-D "$directive" -r 'still get "missing plan"' \
count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=3
: