From fa9d8b702666adc5fe5759c352a9e8467c436804 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 20 May 2019 19:25:35 -0400
Subject: [PATCH] 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>
---
test/notmuch-test | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
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
--
2.45.2