X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=113ea7cf3330ee8b51fdf9fde3c2ec5fd3ec524c;hb=6cca3a5c16dac539db135920bc9ef9c5d237a1d5;hp=adc657d2d220d0a4bde7873bec80eff1fa18bf77;hpb=7058ac2bbe426daeb6c0c7a6f65f4b0e14f8ceb2;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index adc657d2..113ea7cf 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run tests
 #
@@ -18,12 +18,16 @@ cd $(dirname "$0")
 
 TESTS="
   basic
+  help-test
   new
+  count
   search
   search-output
   search-by-folder
   search-position-overlap-bug
   search-insufficient-from-quoting
+  search-limiting
+  tagging
   json
   multipart
   thread-naming
@@ -39,19 +43,32 @@ TESTS="
   emacs
   emacs-large-search-buffer
   maildir-sync
+  crypto
+  symbol-hiding
+  search-folder-coherence
+  atomicity
+  python
 "
 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