[PATCH] test: allow disabling timeout with NOTMUCH_TEST_TIMEOUT=0

Daniel Kahn Gillmor dkg at fifthhorseman.net
Mon May 20 16:25:35 PDT 2019


Tests appear to be hanging when run under GNU timeout on debian
stretch.  To aid in diagnosing this or similar problems, it's handy to
be able to disable timeout from the command line at will.

Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
 test/notmuch-test | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/notmuch-test b/test/notmuch-test
index bbc2dc31..126c28d4 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
-- 
2.20.1



More information about the notmuch mailing list