X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=988dce6c59cb5533d4a703fd52748f030c6b0d41;hp=055467f45988556a4a53d569bddbda6e4bf99745;hb=b183f2635eaf323066f26c7ca22d931d4f4ccd3a;hpb=f22a7ec1e28d1264cf9d67d78796b8ab22e09a35

diff --git a/test/notmuch-test b/test/notmuch-test
index 055467f4..988dce6c 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
 # Copyright (c) 2005 Junio C Hamano
+# Copyright (c) 2010 Notmuch Developers
 #
 # Adapted from a Makefile to a shell script by Carl Worth (2010)
 
@@ -14,30 +15,41 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     exit 1
 fi
 
-set -e
+cd "$(dirname "$0")"
 
-die () {
-    echo >&2 "Unexpected failure"
-}
-
-trap 'die' 0
-
-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 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