Merge branch 'release'

[notmuch] / test / notmuch-test

diff --git a/test/notmuch-test b/test/notmuch-test
index e3e04476f7bc11f2ffe7809fc784a5949456d8f5..ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -18,13 +18,18 @@ 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
   raw
   reply
@@ -36,19 +41,36 @@ TESTS="
   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