-#!/bin/bash
+#!/usr/bin/env bash
# Run tests
#
exit 1
fi
-set -e
-
-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="
+ basic
+ help-test
+ config
+ setup
+ new
+ count
+ insert
+ search
+ search-output
+ search-by-folder
+ search-position-overlap-bug
+ search-insufficient-from-quoting
+ search-limiting
+ excludes
+ tagging
+ json
+ sexp
+ text
+ multipart
+ thread-naming
+ raw
+ reply
+ reply-to-sender
+ dump-restore
+ uuencode
+ thread-order
+ author-order
+ from-guessing
+ long-id
+ encoding
+ emacs
+ emacs-large-search-buffer
+ emacs-subject-to-filename
+ maildir-sync
+ crypto
+ symbol-hiding
+ search-folder-coherence
+ atomicity
+ python
+ hooks
+ argument-parsing
+ emacs-test-functions
+ emacs-address-cleaning
+ emacs-hello
+ emacs-show
+ missing-headers
+ hex-escaping
+ parse-time-string
+ search-date
+ thread-replies
+"
+TESTS=${NOTMUCH_TESTS:=$TESTS}
# 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
./aggregate-results.sh test-results/*
# Clean up
-rm -r test-results corpus.mail
-
-trap '' 0
+rm -rf test-results corpus.mail