X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=b8437127c01fccc98c6f9be595f6cd1b8b0ebb5c;hp=43565e87f55d76ada462b07f6b861518fc105a36;hb=a755c9d6a9099366cc82ba3a4bee8e6d2b83d529;hpb=e2a550b968010e0bb7b5d519ef33409f0cf2f28d

diff --git a/test/notmuch-test b/test/notmuch-test
index 43565e87..b8437127 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -14,30 +14,41 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     exit 1
 fi
 
-set -e
-
-die () {
-    echo >&2 "Unexpected failure"
-}
-
-trap 'die' 0
-
 cd $(dirname "$0")
 
-TESTS="basic new search search-output json thread-naming raw reply dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs maildir-sync"
+TESTS=${NOTMUCH_TESTS:-`echo T[0-9][0-9][0-9]-*.sh`}
 
 # Clean up any results from a previous run
-rm -rf test-results >/dev/null 2>/dev/null
+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 $!
+    # If the test failed without producing results, then it aborted,
+    # so we should abort, too.
+    RES=$?
+    if [[ $RES != 0 && ! -e "test-results/${test%.sh}" ]]; then
+        exit $RES
+    fi
 done
+trap - HUP INT TERM
 
 # Report results
+echo
 ./aggregate-results.sh test-results/*
+ev=$?
 
 # Clean up
-rm -r test-results corpus.mail
+rm -rf test-results corpus.mail
 
-trap '' 0
+exit $ev