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

diff --git a/test/notmuch-test b/test/notmuch-test
index 79e6267b..b8437127 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -16,34 +16,7 @@ fi
 
 cd $(dirname "$0")
 
-TESTS="
-  basic
-  new
-  search
-  search-output
-  search-by-folder
-  search-position-overlap-bug
-  search-insufficient-from-quoting
-  json
-  multipart
-  thread-naming
-  raw
-  reply
-  dump-restore
-  uuencode
-  thread-order
-  author-order
-  from-guessing
-  long-id
-  encoding
-  emacs
-  emacs-large-search-buffer
-  maildir-sync
-  crypto
-  symbol-hiding
-  search-folder-coherence
-"
-TESTS=${NOTMUCH_TESTS:=$TESTS}
+TESTS=${NOTMUCH_TESTS:-`echo T[0-9][0-9][0-9]-*.sh`}
 
 # Clean up any results from a previous run
 rm -r test-results >/dev/null 2>/dev/null
@@ -56,13 +29,26 @@ 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 "$@"
+    $TEST_TIMEOUT_CMD ./$test "$@" &
+    wait $!
+    # If the test failed without producing results, then it aborted,
+    # so we should abort, too.
+    RES=$?
+    if [[ $RES != 0 && ! -e "test-results/${test%.sh}" ]]; then
+        exit $RES
+    fi
 done
+trap - HUP INT TERM
 
 # Report results
+echo
 ./aggregate-results.sh test-results/*
+ev=$?
 
 # Clean up
 rm -rf test-results corpus.mail
+
+exit $ev