X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=ded79e8f703283fa1934add756babb8009d99198;hb=32e656f473a47ae4471a055d668fdcfb35531ceb;hp=9f58c129206d42e0005522ba6dc8d321181cda30;hpb=627d752501b42326b9016271de33a6cb0fa2dc8c;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index 9f58c129..ded79e8f 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -18,12 +18,16 @@ cd $(dirname "$0")
 
 TESTS="
   basic
+  help-test
   new
+  count
   search
   search-output
   search-by-folder
   search-position-overlap-bug
   search-insufficient-from-quoting
+  search-limiting
+  tagging
   json
   multipart
   thread-naming
@@ -40,16 +44,33 @@ TESTS="
   emacs-large-search-buffer
   maildir-sync
   crypto
+  symbol-hiding
+  search-folder-coherence
+  atomicity
+  python
+  hooks
+  argument-parsing
 "
 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
+
+trap 'e=$?; kill $!; exit $e' HUP INT TERM
 # Run the tests
 for test in $TESTS; do
-	./$test "$@"
+    $TEST_TIMEOUT_CMD ./$test "$@" &
+    wait $!
 done
+trap - HUP INT TERM
 
 # Report results
 ./aggregate-results.sh test-results/*