X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=fe85c6a4032f9fbd2e88ad5a2bf9afce067e8679;hb=0cc5483a9cc496bbaa1a6aef03e99b4a7686f779;hp=fcf43a868644ad4ca95e351e9e5df771471e7f33;hpb=600f3761dc48c91a5ba9a18ddeb7fd8af22e71de;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index fcf43a86..fe85c6a4 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -16,18 +16,52 @@ fi
 
 cd $(dirname "$0")
 
-TESTS="basic new search search-output search-by-folder json thread-naming raw reply dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs maildir-sync"
+TESTS="
+  basic
+  new
+  search
+  search-output
+  search-by-folder
+  search-position-overlap-bug
+  search-insufficient-from-quoting
+  json
+  multipart
+  thread-naming
+  raw
+  reply
+  dump-restore
+  uuencode
+  thread-order
+  author-order
+  from-guessing
+  long-id
+  encoding
+  emacs
+  emacs-large-search-buffer
+  maildir-sync
+  crypto
+  symbol-hiding
+"
+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
 ./aggregate-results.sh test-results/*
 
 # Clean up
-rm -r test-results corpus.mail
+rm -rf test-results corpus.mail