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

diff --git a/test/notmuch-test b/test/notmuch-test
index 5c066ed1..b8437127 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,54 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-cd $(dirname $0)
-make
+# Run tests
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+# Adapted from a Makefile to a shell script by Carl Worth (2010)
+
+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 $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
+echo
+./aggregate-results.sh test-results/*
+ev=$?
+
+# Clean up
+rm -rf test-results corpus.mail
+
+exit $ev