[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests: use more portable timeout presence check
|
From: |
Pádraig Brady |
|
Subject: |
[PATCH] tests: use more portable timeout presence check |
|
Date: |
Wed, 15 Jan 2025 16:26:43 +0000 |
* init.cfg: timeout(1) on FreeBSD doesn't support --version
(or --help with success status), so use syntax compatible
with both FreeBSD and GNU.
---
init.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init.cfg b/init.cfg
index 0aaba4ee2..ae158c7a3 100644
--- a/init.cfg
+++ b/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 ||
--
2.47.1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] tests: use more portable timeout presence check,
Pádraig Brady <=