X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570;hb=5af65f65e8a32fb7f11f5b1c2036e35a4c4809e2;hp=60c3ecbcbe9968ac0dcd5fe2798a32ff6ec5cbf0;hpb=20018a0c094f576589ea82d5ca5116dfd3c0ea55;p=notmuch

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