diff options
| author | Pádraig Brady <P@draigBrady.com> | 2010-03-15 23:03:30 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2010-03-16 23:10:15 +0000 |
| commit | c403c31e8806b732e1164ef4a206b0eab71bca95 (patch) | |
| tree | c593bccff037db3c5f332810aec7dfbc33a30683 /tests/misc/timeout | |
| parent | 4edb86215deec3ad7478eb4eca54d563bd3b95c0 (diff) | |
| download | coreutils-c403c31e8806b732e1164ef4a206b0eab71bca95.tar.xz | |
timeout: add the --kill-after option
Based on a report from Kim Hansen who wanted to
send a KILL signal to the monitored command
when `timeout` itself received a termination signal.
Rather than changing such a signal into a KILL,
we provide the more general mechanism of sending
the KILL after the specified grace period.
* src/timeout.c (cleanup): If a non zero kill delay
is specified, (re)set the alarm to that delay, after
which a KILL signal will be sent to the process group.
(usage): Mention the new option. Separate the description
of DURATION since it's now specified in 2 places.
Clarify that the duration is an integer.
(parse_duration): A new function refactored from main(),
since this logic is now called for two parameters.
(main): Parse the -k option.
* doc/coreutils.texi (timeout invocation): Describe the
new --kill-after option and use @display rather than
@table to show the duration suffixes. Clarify that
a duration of 0 disables the associated timeout.
* tests/misc/timeout-parameters: Check invalid --kill-after.
* tests/misc/timeout: Check a valid --kill-after works.
* NEWS: Mention the new feature.
Diffstat (limited to 'tests/misc/timeout')
| -rwxr-xr-x | tests/misc/timeout | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/misc/timeout b/tests/misc/timeout index 3bd3af39a..6c9b02e80 100755 --- a/tests/misc/timeout +++ b/tests/misc/timeout @@ -40,6 +40,12 @@ test $? = 2 || fail=1 timeout 1 sleep 10 test $? = 124 || fail=1 +# kill delay. Note once the initial timeout triggers, +# the exit status will be 124 even if the command +# exits on its own accord. +timeout -s0 -k1 1 sleep 10 +test $? = 124 && fail=1 + # Ensure `timeout` is immune to parent's SIGCHLD handler # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh. ( |