Merge branch 'release'

[notmuch] / test / notmuch-test

diff --git a/test/notmuch-test b/test/notmuch-test
index fe85c6a4032f9fbd2e88ad5a2bf9afce067e8679..ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -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
@@ -41,6 +45,8 @@ TESTS="
   maildir-sync
   crypto
   symbol-hiding
+  search-folder-coherence
+  atomicity
 "
 TESTS=${NOTMUCH_TESTS:=$TESTS}
 
@@ -55,10 +61,13 @@ 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 $!
 done
+trap - HUP INT TERM
 
 # Report results
 ./aggregate-results.sh test-results/*