X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=79e6267b803252ccf92b1df2f5e7d56bdbbd7f41;hp=c0aed3145b0d805ce59d0567a3322229a12f4064;hb=c04e6f84d3de7236891696b7c6cc009e7f5e976c;hpb=a3bf541e2b28f368905fbc17be2987eb4502e25d

diff --git a/test/notmuch-test b/test/notmuch-test
index c0aed314..79e6267b 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -25,6 +25,7 @@ TESTS="
   search-position-overlap-bug
   search-insufficient-from-quoting
   json
+  multipart
   thread-naming
   raw
   reply
@@ -36,20 +37,32 @@ TESTS="
   long-id
   encoding
   emacs
+  emacs-large-search-buffer
   maildir-sync
-  emacs-forgetfulness
+  crypto
+  symbol-hiding
+  search-folder-coherence
 "
+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