X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=bbabf288b2226c2120e055ec139f0b25ef2895db;hp=8dd9c1ecf097d69e6084e25ada74bcc8af3102a8;hb=ed20210b6db0b237d48765351cb99b87be7a0509;hpb=4e414e2a5a72e8345df6371b3524030d07c2ce96

diff --git a/test/notmuch-test b/test/notmuch-test
index 8dd9c1ec..bbabf288 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -24,7 +24,9 @@ TESTS="
   search-by-folder
   search-position-overlap-bug
   search-insufficient-from-quoting
+  tagging
   json
+  multipart
   thread-naming
   raw
   reply
@@ -38,18 +40,31 @@ TESTS="
   emacs
   emacs-large-search-buffer
   maildir-sync
+  crypto
+  symbol-hiding
+  search-folder-coherence
+  atomicity
 "
+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
+
 # Run the tests
 for test in $TESTS; do
-	./$test "$@"
+    $TEST_TIMEOUT_CMD ./$test "$@"
 done
 
 # Report results
 ./aggregate-results.sh test-results/*
 
 # Clean up
-rm -r test-results corpus.mail
+rm -rf test-results corpus.mail