X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=b58fd3b36f942a91fbe0ac9708d53aef9fdf4e1e;hp=43565e87f55d76ada462b07f6b861518fc105a36;hb=11ac932a4503872c19987b843d58513c4b9ef76f;hpb=e2a550b968010e0bb7b5d519ef33409f0cf2f28d

diff --git a/test/notmuch-test b/test/notmuch-test
index 43565e87..b58fd3b3 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,80 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     exit 1
 fi
 
-set -e
+# Ensure NOTMUCH_SRCDIR and NOTMUCH_BUILDDIR are set.
+. $(dirname "$0")/export-dirs.sh || exit 1
 
-die () {
-    echo >&2 "Unexpected failure"
-}
+TESTS=
+for test in $NOTMUCH_TESTS; do
+    TESTS="$TESTS $NOTMUCH_SRCDIR/test/$test"
+done
 
-trap 'die' 0
+if [[ -z "$TESTS" ]]; then
+    TESTS="$NOTMUCH_SRCDIR/test/T[0-9][0-9][0-9]-*.sh"
+fi
 
-cd $(dirname "$0")
+# Clean up any results from a previous run
+rm -rf $NOTMUCH_BUILDDIR/test/test-results
 
-TESTS="basic new search search-output json thread-naming raw reply dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs maildir-sync"
+# Test for timeout utility
+if command -v timeout >/dev/null; then
+    TEST_TIMEOUT=${NOTMUCH_TEST_TIMEOUT:-2m}
+    if [ "$TEST_TIMEOUT" = 0 ]; then
+        TEST_TIMEOUT_CMD=""
+        echo "INFO: timeout disabled"
+    else
+        TEST_TIMEOUT_CMD="timeout $TEST_TIMEOUT"
+        echo "INFO: using $TEST_TIMEOUT timeout for tests"
+    fi
+else
+    TEST_TIMEOUT_CMD=""
+fi
 
-# Clean up any results from a previous run
-rm -rf test-results >/dev/null 2>/dev/null
+trap 'e=$?; kill $!; exit $e' HUP INT TERM
 
+META_FAILURE=
 # Run the tests
-for test in $TESTS; do
-	./$test "$@"
-done
+if test -z "$NOTMUCH_TEST_SERIALIZE" && command -v parallel >/dev/null ; then
+    test -t 1 && export COLORS_WITHOUT_TTY=t || :
+    if parallel -h | grep -q GNU ; then
+        echo "INFO: running tests with GNU parallel"
+        printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel
+    else
+        echo "INFO: running tests with moreutils parallel"
+        $TEST_TIMEOUT_CMD parallel -- $TESTS
+    fi
+    RES=$?
+    if [[ $RES != 0 ]]; then
+        META_FAILURE="parallel test suite returned error code $RES"
+    fi
+else
+    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=$?
+        testname=$(basename $test .sh)
+        if [[ $RES != 0 && ! -e "$NOTMUCH_BUILDDIR/test/test-results/$testname" ]]; then
+            META_FAILURE="Aborting on $testname (returned $RES)"
+            break
+        fi
+    done
+fi
+trap - HUP INT TERM
 
 # Report results
-./aggregate-results.sh test-results/*
+echo
+$NOTMUCH_SRCDIR/test/aggregate-results.sh $NOTMUCH_BUILDDIR/test/test-results/*
+ev=$?
+if [ -n "$META_FAILURE" ]; then
+    printf 'ERROR: %s\n' "$META_FAILURE"
+    if [ $ev = 0 ]; then
+        ev=$RES
+    fi
+fi
 
 # Clean up
-rm -r test-results corpus.mail
+rm -rf $NOTMUCH_BUILDDIR/test/test-results
 
-trap '' 0
+exit $ev