mirror of
https://https.git.savannah.gnu.org/git/coreutils.git
synced 2026-01-26 15:29:07 +00:00
tests: use more portable timeout presence check
* init.cfg: timeout(1) on FreeBSD doesn't support --version (or --help with success status), so use syntax compatible with both FreeBSD and GNU.
This commit is contained in:
parent
1555bcec6a
commit
c12baacddc
4
init.cfg
4
init.cfg
@ -570,7 +570,7 @@ seek_data_capable_()
|
||||
# We saw FreeBSD 9.1 take 35s to return from SEEK_DATA for a 1TiB empty file.
|
||||
# Note lseek() is uninterruptible on FreeBSD 9.1, but it does eventually
|
||||
# return, and the timeout will ensure a failure return from the process.
|
||||
timeout --version >/dev/null && TIMEOUT_='timeout 10'
|
||||
timeout 1 true >/dev/null && TIMEOUT_='timeout 10'
|
||||
|
||||
$TIMEOUT_ $PYTHON_ "$abs_srcdir"/tests/seek-data-capable "$@"
|
||||
}
|
||||
@ -660,7 +660,7 @@ mkfifo_or_skip_()
|
||||
|
||||
trap_sigpipe_or_skip_()
|
||||
{
|
||||
timeout --version >/dev/null ||
|
||||
timeout 1 true >/dev/null ||
|
||||
skip_ 'trapping SIGPIPE cannot be safely checked'
|
||||
|
||||
(trap '' PIPE && timeout 10 yes |:) 2>&1 | grep 'Broken pipe' >/dev/null ||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user