X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=6db797955bdb54d852b060f0bae3083335672759;hp=9d77c0fa172559e187f4216afceee0e41823a2e8;hb=7e3a7ed62fcd939e04f39c8ba43c4702d10e9d16;hpb=cb6411e29135217aaf4abb0615a8ca730c5f2bc2

diff --git a/test/notmuch-test b/test/notmuch-test
index 9d77c0fa..6db79795 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -18,15 +18,28 @@ cd $(dirname "$0")
 
 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
@@ -35,19 +48,55 @@ TESTS="
   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 -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