Merge tag 'debian/0.17-3'

[notmuch] / test / notmuch-test

diff --git a/test/notmuch-test b/test/notmuch-test
index cc732c3c731ea3988ba20e97393f0490f3d45d28..d6fdd3a5d7f3a07d2db111643c80e40fb29a5698 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -19,9 +19,12 @@ cd $(dirname "$0")
 TESTS="
   basic
   help-test
+  compact
   config
+  setup
   new
   count
+  insert
   search
   search-output
   search-by-folder
@@ -31,6 +34,7 @@ TESTS="
   excludes
   tagging
   json
+  sexp
   text
   multipart
   thread-naming
@@ -59,7 +63,12 @@ TESTS="
   emacs-address-cleaning
   emacs-hello
   emacs-show
+  emacs-tree
   missing-headers
+  hex-escaping
+  parse-time-string
+  search-date
+  thread-replies
 "
 TESTS=${NOTMUCH_TESTS:=$TESTS}
 
@@ -79,11 +88,21 @@ trap 'e=$?; kill $!; exit $e' HUP INT TERM
 for test in $TESTS; do
     $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