Merge branch 'release'

[notmuch] / test / notmuch-test

diff --git a/test/notmuch-test b/test/notmuch-test
index adfd589fe0765d19d575d4714f59ef4f352b6022..ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -18,6 +18,7 @@ cd $(dirname "$0")
 
 TESTS="
   basic
+  help-test
   new
   count
   search
@@ -60,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/*