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

diff --git a/test/notmuch-test b/test/notmuch-test
index 8ff21cc6..988dce6c 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,23 +1,55 @@
-#!/bin/sh
+#!/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)
 
-cd $(dirname "$0")
+if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
+    echo "Error: The notmuch test suite requires a bash version >= 4.0"
+    echo "due to use of associative arrays within the test suite."
+    echo "Please try again with a newer bash (or help us fix the"
+    echo "test suite to be more portable). Thanks."
+    exit 1
+fi
+
+cd "$(dirname "$0")"
+
+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 t[0-9][0-9][0-9][0-9]*.sh; do
-	./"$test"
+for test in $TESTS; do
+    $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
-./aggregate-results.sh test-results/t*-*
+echo
+./aggregate-results.sh test-results/*
+ev=$?
 
 # Clean up
-rm -r test-results
+rm -rf test-results corpus.mail
+
+exit $ev