From: Jim Meyering <meyering@fb.com>
Date: Thu, 17 Sep 2020 14:36:26 +0000 (-0700)
Subject: test-dfa-match.sh: port timeout work-around to newer Busybox
X-Git-Tag: v1.0~3630
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d7d69621581065274582c78981b58dbce4313d2c;p=gnulib.git

test-dfa-match.sh: port timeout work-around to newer Busybox

* tests/test-dfa-match.sh: Update timeout -t portability test to
accommodate Busybox 1.30.0 and newer.
---

diff --git a/ChangeLog b/ChangeLog
index bbd420cb28..e5b50bf552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-09-17  Jim Meyering  <meyering@fb.com>
+
+	test-dfa-match.sh: port timeout work-around to newer Busybox
+	* tests/test-dfa-match.sh: Update timeout -t portability test to
+	accommodate Busybox 1.30.0 and newer.
+
 2020-09-16  Paul Eggert  <eggert@cs.ucla.edu>
 
 	fnmatch: adjust to match glibc fix
diff --git a/tests/test-dfa-match.sh b/tests/test-dfa-match.sh
index a7285ec0b2..d3c434d661 100755
--- a/tests/test-dfa-match.sh
+++ b/tests/test-dfa-match.sh
@@ -22,7 +22,9 @@
 path_prepend_ .
 
 if (type timeout) >/dev/null 2>&1; then
-  if timeout --help 2>&1 | grep BusyBox; then
+    # Busybox's timeout required -t until its 1.30.0 release on 2018-12-31,
+    # after which it became compatible with coreutils' timeout.
+  if timeout --help 2>&1 | grep BusyBox && timeout -t 0 true; then
     timeout_10='timeout -t 10'
   else
     timeout_10='timeout 10'