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

diff --git a/test/notmuch-test b/test/notmuch-test
index 5c066ed1..43565e87 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,43 @@
 #!/bin/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
+
+set -e
+
+die () {
+    echo >&2 "Unexpected failure"
+}
+
+trap 'die' 0
+
+cd $(dirname "$0")
+
+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"
+
+# Clean up any results from a previous run
+rm -rf test-results >/dev/null 2>/dev/null
+
+# Run the tests
+for test in $TESTS; do
+	./$test "$@"
+done
+
+# Report results
+./aggregate-results.sh test-results/*
+
+# Clean up
+rm -r test-results corpus.mail
+
+trap '' 0