From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 20 May 2019 23:25:35 +0000 (-0400)
Subject: test: allow disabling timeout with NOTMUCH_TEST_TIMEOUT=0
X-Git-Tag: archive/debian/0.29_rc0-1~31
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=fa9d8b702666adc5fe5759c352a9e8467c436804

test: allow disabling timeout with NOTMUCH_TEST_TIMEOUT=0

To aid in diagnosing test suite tooling that interacts poorly with
coreutils' timeout, it's handy to be able to bypass it entirely.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---

diff --git a/test/notmuch-test b/test/notmuch-test
index 8e483383..50ed8721 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -33,8 +33,13 @@ rm -rf $NOTMUCH_BUILDDIR/test/test-results
 # Test for timeout utility
 if command -v timeout >/dev/null; then
     TEST_TIMEOUT=${NOTMUCH_TEST_TIMEOUT:-2m}
-    TEST_TIMEOUT_CMD="timeout $TEST_TIMEOUT"
-    echo "INFO: using $TEST_TIMEOUT timeout for tests"
+    if [ "$TEST_TIMEOUT" = 0 ]; then
+        TEST_TIMEOUT_CMD=""
+        echo "INFO: timeout disabled"
+    else
+        TEST_TIMEOUT_CMD="timeout $TEST_TIMEOUT"
+        echo "INFO: using $TEST_TIMEOUT timeout for tests"
+    fi
 else
     TEST_TIMEOUT_CMD=""
 fi