X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=aa28bb05e71160c937865c55eb5add3f4ffc02d5;hp=29de30d7652c3fc6bc7889c44cc450b8b92086cc;hb=71521f06b00a01c5b0eaea5f5f624fe57ed7f426;hpb=28d78c2b02ade16d5e5b8a0bc021acb5158ba777 diff --git a/test/notmuch-test b/test/notmuch-test index 29de30d7..aa28bb05 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -18,19 +18,28 @@ cd $(dirname "$0") TESTS=" basic + help-test + config + setup new count + insert search search-output search-by-folder search-position-overlap-bug search-insufficient-from-quoting + search-limiting + excludes tagging json + sexp + text multipart thread-naming raw reply + reply-to-sender dump-restore uuencode thread-order @@ -40,11 +49,24 @@ TESTS=" encoding emacs emacs-large-search-buffer + emacs-subject-to-filename maildir-sync crypto symbol-hiding search-folder-coherence atomicity + python + hooks + argument-parsing + emacs-test-functions + emacs-address-cleaning + emacs-hello + emacs-show + missing-headers + hex-escaping + parse-time-string + search-date + thread-replies " TESTS=${NOTMUCH_TESTS:=$TESTS} @@ -59,13 +81,25 @@ 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 ./aggregate-results.sh test-results/* +ev=$? # Clean up rm -rf test-results corpus.mail + +exit $ev