aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2011-05-28 06:50:11 -0300
committerGravatar David Bremner <bremner@debian.org>2011-06-22 08:11:32 -0300
commit114eb1c52095487caed1de8746f2741da7a3ead1 (patch)
tree67a1883459a82d4c76cab98acb3cc5d0ec0f09a4
parentc39b492c19ae667b2db2205b113d8378ddcb9093 (diff)
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)
-rwxr-xr-xtest/notmuch-test10
1 files changed, 9 insertions, 1 deletions
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