AC_ARG_VAR([AM_TEST_RUNNER_SHELL],
[a sturdy POSIX shell for our testsuite])
-# FIXME: remove soon
-AC_SUBST([sh_errexit_works], [yes])
-
## ---------------------- ##
## Create output files. ##
## ---------------------- ##
distdir=$me-1.0
# Set up the exit trap.
-if test "$sh_errexit_works" = yes; then
+# FIXME: adjust indentation, here and below.
trap 'exit_status=$?
set +e
cd "$am_top_builddir"
# See also Test::Harness bug [rt.cpan.org #70855], archived at
# <https://rt.cpan.org/Ticket/Display.html?id=70855>
trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13
-fi
# Create and populate the temporary directory, if and as required.
if test x"$am_create_testdir" = x"no"; then
# this variable.
TEX=${AM_TESTSUITE_TEX-'@TEX@'}
-# Whether $SHELL has working 'set -e' with exit trap.
-sh_errexit_works='@sh_errexit_works@'
-
# The amount we should wait after modifying files depends on the platform.
# For instance, Windows '95, '98 and ME have 2-second granularity
# and can be up to 3 seconds in the future w.r.t. the system clock.
. ./defs || Exit 1
-if test x"$sh_errexit_works" != x"yes"; then
- skip_all_ "$me: no working exit trap with 'set -e'"
-fi
-
plan_ 43
# We still need a little hack to make ./defs work outside automake's
# Reset default SIGINT handler as portably as possible.
trap 2 || trap - 2
fi
- if test x"$sh_errexit_works" = x"yes"; then
- # The exit trap should turn into an hard errors any failure
- # caused by signals.
- command_ok_ "kill -$sig" test $rc -eq 99
- else
- # The exit trap is not installed, so that the shell should exit
- # with status 128+n when receiving signal number n. But don't
- # be too strict in the check, as POSIX only says that "The exit
- # status of a command that terminated because it received a
- # signal shall be reported as greater than 128".
- command_ok_ "kill -$sig" test $rc -gt 128
- fi
+ command_ok_ "kill -$sig" test $rc -eq 99
unset rc
done
am_create_testdir=empty
. ./defs || Exit 1
-test x"$sh_errexit_works" = x"yes" || skip_ "no working shell exit trap"
-
# We still need a little hack to make ./defs work outside automake's
# tree 'tests' subdirectory. Not a big deal.
sed "s|^am_top_builddir=.*|am_top_builddir='`pwd`'|" \