Merge branch 'release'

[notmuch] / test / notmuch-test

diff --git a/test/notmuch-test b/test/notmuch-test
index bbabf288b2226c2120e055ec139f0b25ef2895db..ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -18,12 +18,15 @@ cd $(dirname "$0")
 
 TESTS="
   basic
 
 TESTS="
   basic

+  help-test

   new
   new

+  count

   search
   search-output
   search-by-folder
   search-position-overlap-bug
   search-insufficient-from-quoting
   search
   search-output
   search-by-folder
   search-position-overlap-bug
   search-insufficient-from-quoting

+  search-limiting

   tagging
   json
   multipart
   tagging
   json
   multipart


@@ -58,10 +61,13 @@ else
     TEST_TIMEOUT_CMD=""
 fi
 
     TEST_TIMEOUT_CMD=""
 fi
 

+trap 'e=$?; kill $!; exit $e' HUP INT TERM

 # Run the tests
 for test in $TESTS; do
 # Run the tests
 for test in $TESTS; do

-    $TEST_TIMEOUT_CMD ./$test "$@"
+    $TEST_TIMEOUT_CMD ./$test "$@" &
+    wait $!

 done
 done

+trap - HUP INT TERM

 
 # Report results
 ./aggregate-results.sh test-results/*
 
 # Report results
 ./aggregate-results.sh test-results/*