Mercurial > gnulib

changeset 40027:4a3cb97ca34c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dfa tests: Avoid test failure on Alpine Linux. * tests/dfa-match.sh (timeout_10): Accommodate the BusyBox 'timeout' command found on Alpine Linux.
author Bruno Haible <bruno@clisp.org>
date Sat, 15 Dec 2018 22:01:27 +0100
parents c51e38088432
children 8850daca13bd
files ChangeLog tests/dfa-match.sh
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Dec 15 10:09:35 2018 -0800
+++ b/ChangeLog	Sat Dec 15 22:01:27 2018 +0100
@@ -1,3 +1,9 @@
+2018-12-15  Bruno Haible  <bruno@clisp.org>
+
+	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  <meyering@fb.com>
 
 	dfa: avoid new warnings from gcc
--- a/tests/dfa-match.sh	Sat Dec 15 10:09:35 2018 -0800
+++ b/tests/dfa-match.sh	Sat Dec 15 22:01:27 2018 +0100
@@ -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