From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 20 May 2019 17:20:56 +0000 (-0400)
Subject: tests: make timeout configurable with NOTMUCH_TEST_TIMEOUT (default: 2m)
X-Git-Tag: archive/debian/0.29_rc0-1~52
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=73bf7e532e8388416981d9e2378d10ff04264097

tests: make timeout configurable with NOTMUCH_TEST_TIMEOUT (default: 2m)

The current 2 minute timeout is reasonable, but to exercise the test
suite or induce timeout failures, we might want to make it shorter.
This makes it configurable so you can run (for example):

    make check NOTMUCH_TEST_TIMEOUT=10s

We stick with the default of 2m.

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

diff --git a/test/notmuch-test b/test/notmuch-test
index bd3e080a..dbca39ca 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -32,8 +32,9 @@ rm -rf $NOTMUCH_BUILDDIR/test/test-results
 
 # Test for timeout utility
 if command -v timeout >/dev/null; then
-    TEST_TIMEOUT_CMD="timeout 2m"
-    echo "INFO: using 2 minute timeout for tests"
+    TEST_TIMEOUT=${NOTMUCH_TEST_TIMEOUT:-2m}
+    TEST_TIMEOUT_CMD="timeout $TEST_TIMEOUT"
+    echo "INFO: using $TEST_TIMEOUT timeout for tests"
 else
     TEST_TIMEOUT_CMD=""
 fi