tests init: don't automatically re-execute tests with a POSIX shell

[platform/upstream/automake.git] / t / self-check-exit.tap

diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
index e78ca0b..0fbc9d8 100755 (executable)
--- a/t/self-check-exit.tap
+++ b/t/self-check-exit.tap
@@ -29,8 +29,6 @@ plan_ 34
 # so that false positives remain very unlikely.
 set +e
 
-AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
-
 # It's especially important that the 'unset' is done before sourcing
 # ./defs, i.e., when 'set -e' is not active yet, for the benefit of shells
 # (like Bash 2.05 and Solaris 10 /bin/ksh) that returns a non-zero status
@@ -72,23 +70,8 @@ for sig in 1 2 13 15; do
 done
 
 : Non-existent program.
-# Solaris 10 /bin/sh erroneously exit with success right away when the
-# following three conditions are met at the same time:
-#   1. the 'errexit' flag is active,
-#   2. an exit trap is installed, and
-#   3. a non-existing command is issued.
-# Note that the non-existent command is issued as the last command to
-# the shell in the next line; this is deliberate.
-# FIXME: remove this workaround once we have a better configure-time
-# determination of '$AM_TEST_RUNNER_SHELL'.
-if $AM_TEST_RUNNER_SHELL -c 'set -e; trap "exit \$?" 0; non-existent-program'; then
-  maybe_todo=TODO reason="known Solaris /bin/sh bug"
-else
-  maybe_todo="" reason=""
-fi
 $AM_TEST_RUNNER_SHELL -c "$init non-existent-prog; :" "$dummy_test_script"
-command_ok_ "command not found" -D "$maybe_todo" -r "$reason" \
-            -- test $? -gt 0
+command_ok_ "command not found" -- test $? -gt 0
 
 : Non-executable command.
 test -f Makefile && test ! -x Makefile || \