From 114eb1c52095487caed1de8746f2741da7a3ead1 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 28 May 2011 06:50:11 -0300 Subject: [PATCH] tests: Add optional use of timeout utility, if present. Each top level test (basic, corpus, etc...) is run with a fixed timeout of 2 minutes. The goal here is to treat a hung test as a failure. The emacs test for sending mail is known to be problematic on the Debian autobuilders. This is both a bandaid fix for that, and a sensible long term feature. (cherry picked from commit 5f99c80e02736c90495558d9b88008a768876b29) --- test/notmuch-test | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/notmuch-test b/test/notmuch-test index 9f58c129..83f284d9 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -46,9 +46,17 @@ TESTS=${NOTMUCH_TESTS:=$TESTS} # Clean up any results from a previous run rm -r test-results >/dev/null 2>/dev/null +# test for timeout utility +if command -v timeout >/dev/null; then + TEST_TIMEOUT_CMD="timeout 2m " + echo "INFO: using 2 minute timeout for tests" +else + TEST_TIMEOUT_CMD="" +fi + # Run the tests for test in $TESTS; do - ./$test "$@" + $TEST_TIMEOUT_CMD ./$test "$@" done # Report results