X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=6c65ed7a282bed731cc5bd4bbf0ce5196ee84dbd;hb=9cfafc070a4df4935781a274f039dc63790ed0c2;hp=0ea4f4f732534ca68be1430c7cebd131a032beaf;hpb=04927208fa10cfa33d2ca93dfcb5ac95f25f55a1;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index 0ea4f4f7..6c65ed7a 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -19,11 +19,14 @@ cd $(dirname "$0")
 TESTS="
   basic
   new
+  count
   search
   search-output
   search-by-folder
   search-position-overlap-bug
   search-insufficient-from-quoting
+  search-limiting
+  tagging
   json
   multipart
   thread-naming
@@ -39,16 +42,31 @@ TESTS="
   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/*