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

diff --git a/test/notmuch-test b/test/notmuch-test
index 9a3c6983..b8437127 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -16,18 +16,39 @@ fi
 
 cd $(dirname "$0")
 
-TESTS="basic new search json thread-naming raw reply dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs"
+TESTS=${NOTMUCH_TESTS:-`echo T[0-9][0-9][0-9]-*.sh`}
 
 # 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 $!
+    # 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
+
+exit $ev