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

diff --git a/test/notmuch-test b/test/notmuch-test
index 5c066ed1..9a1b3758 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,91 @@
-#!/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="
+  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
+  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
+  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_TIMEOUT_CMD ./$test "$@" &
+    wait $!
+done
+trap - HUP INT TERM
+
+# Report results
+./aggregate-results.sh test-results/*
+
+# Clean up
+rm -rf test-results corpus.mail