mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
tests: timeout: fix false failure on some shells
The fix in commit v9.12-166-gb6b06854f was incomplete. This is now tested to pass with SHELL=/bin/dash on Debian 10 (which otherwise defaults to bash even though /bin/sh is dash). * tests/timeout/timeout.sh: Ensure the waiting shell's stderr is not redirected to the full pipe, so any "Killed" message does not block things.
This commit is contained in:
1 parent
d58314f178
commit
b4728bfa9b
1 file changed
+4
-2
@@ -121,8 +121,10 @@ timeout -v .1 $SHELL -c '
|
||||
test -e term.missed && fail=1
|
||||
|
||||
# A group-wide SIGKILL must not wait for the verbose diagnostic either.
|
||||
# Redirect in a subshell so a waiting shell's "Killed" diagnostic
|
||||
# cannot block on the filled pipe before recording the exit status.
|
||||
file=kill.status
|
||||
{ timeout -v -s KILL .1 yes 2>&1
|
||||
{ (exec timeout -v -s KILL .1 yes 2>&1)
|
||||
echo $? >kill.status; } |
|
||||
{ retry_delay_ file_seen .1 6 || touch kill.missed; }
|
||||
test -e kill.missed && fail=1
|
||||
@@ -131,7 +133,7 @@ compare kill.exp kill.status || fail=1
|
||||
|
||||
# --kill-after must interrupt a blocked diagnostic for the initial signal.
|
||||
file=kill-after.status
|
||||
{ timeout -v -k .1 .1 $SHELL -c 'trap "" TERM; exec yes >&2' 2>&1
|
||||
{ (exec timeout -v -k .1 .1 $SHELL -c 'trap "" TERM; exec yes >&2' 2>&1)
|
||||
echo $? >kill-after.status; } |
|
||||
{ retry_delay_ file_seen .1 6 || touch kill-after.missed; }
|
||||
test -e kill-after.missed && fail=1
|
||||
|
||||
Reference in new issue
Block a user