mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-20 22:32:17 +02:00
c403c31e88
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.
59 lines
1.6 KiB
Bash
Executable File
59 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# Validate timeout basic operation
|
|
|
|
# Copyright (C) 2008-2010 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 3 of the License, 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/>.
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
timeout --version
|
|
fi
|
|
|
|
. $srcdir/test-lib.sh
|
|
|
|
# no timeout
|
|
timeout 10 true || fail=1
|
|
|
|
# no timeout (suffix check)
|
|
timeout 1d true || fail=1
|
|
|
|
# disabled timeout
|
|
timeout 0 true || fail=1
|
|
|
|
# exit status propagation
|
|
timeout 10 sh -c 'exit 2'
|
|
test $? = 2 || fail=1
|
|
|
|
# timeout
|
|
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.
|
|
(
|
|
# ash doesn't support "trap '' CHLD"; it knows only signal numbers.
|
|
sig=`"$abs_top_builddir/src/kill" -l CHLD 2>/dev/null` && trap '' $sig
|
|
|
|
exec timeout 10 true
|
|
) || fail=1
|
|
|
|
Exit $fail
|