From 44b81ab453560360a2744434951e6547f413292c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 15 Dec 2018 22:01:27 +0100 Subject: [PATCH] dfa tests: Avoid test failure on Alpine Linux. * tests/dfa-match.sh (timeout_10): Accommodate the BusyBox 'timeout' command found on Alpine Linux. --- ChangeLog | 6 ++++++ tests/dfa-match.sh | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5173ac51b2..61b54dae37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-12-15 Bruno Haible + + dfa tests: Avoid test failure on Alpine Linux. + * tests/dfa-match.sh (timeout_10): Accommodate the BusyBox 'timeout' + command found on Alpine Linux. + 2018-12-15 Jim Meyering dfa: avoid new warnings from gcc diff --git a/tests/dfa-match.sh b/tests/dfa-match.sh index c06bb44c20..1923c2d980 100755 --- a/tests/dfa-match.sh +++ b/tests/dfa-match.sh @@ -22,7 +22,11 @@ path_prepend_ . if (type timeout) >/dev/null 2>&1; then - timeout_10='timeout 10' + if timeout --help 2>&1 | grep BusyBox; then + timeout_10='timeout -t 10' + else + timeout_10='timeout 10' + fi else timeout_10= fi -- 2.39.5