X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=50ed87219f3cb0793208aca2c3eed3e1199c5ce0;hb=d187a6993e25b1e100790e918156f5d95d371899;hp=8e483383f79d67aa7d87c04949e51407ddb7542d;hpb=3563079be37737aab084e957b494070eaea9c2f6;p=notmuch

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