X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=e7d3151ce8cbb528c68d6526ba4c39a035d5a1eb;hp=1e9f54ee1a489ccc3e06bbf7c48a1221bedce129;hb=86cbd215eb67d7b996c977352a50e70c101cb641;hpb=99ad348deb8282185ae56a51dc4af02f3c241f97

diff --git a/test/notmuch-test b/test/notmuch-test
index 1e9f54ee..e7d3151c 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,41 +15,41 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     exit 1
 fi
 
-cd $(dirname "$0")
-
-TESTS="
-  basic
-  new
-  search
-  search-output
-  search-by-folder
-  search-position-overlap-bug
-  search-lwn
-  json
-  thread-naming
-  raw
-  reply
-  dump-restore
-  uuencode
-  thread-order
-  author-order
-  from-guessing
-  long-id
-  encoding
-  emacs
-  maildir-sync
-"
+cd "$(dirname "$0")"
+
+TESTS=${NOTMUCH_TESTS:-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
+rm -rf test-results
+
+# 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