X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=ca9c3dcbdcfdb514179c80bf2fca89e469ac4f27;hp=13c5d80686bf6c2fb28ca9f4d65e9cf1a8fcfefa;hb=e7c661d31a23d1f711a84e6eca85eea9b67f11fe;hpb=5497b01c27ed217bc351d9995e0f46c3d6ff2442

diff --git a/test/notmuch-test b/test/notmuch-test
index 13c5d806..ca9c3dcb 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -6,20 +6,94 @@
 #
 # 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="basic new search json thread-naming reply dump-restore uuencode thread-order author-order from-guessing long-id encoding"
+TESTS="
+  basic
+  help-test
+  config
+  new
+  count
+  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
+"
+TESTS=${NOTMUCH_TESTS:=$TESTS}
 
 # 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 "$@"
+    $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
+rm -rf test-results corpus.mail