X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=d6fdd3a5d7f3a07d2db111643c80e40fb29a5698;hp=bbabf288b2226c2120e055ec139f0b25ef2895db;hb=79b6b0190b36f5c9f14af48a3af675d2a16a46f3;hpb=ed20210b6db0b237d48765351cb99b87be7a0509 diff --git a/test/notmuch-test b/test/notmuch-test index bbabf288..d6fdd3a5 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -18,18 +18,29 @@ cd $(dirname "$0") TESTS=" basic + help-test + compact + 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 @@ -39,11 +50,25 @@ 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 + emacs-tree + missing-headers + hex-escaping + parse-time-string + search-date + thread-replies " TESTS=${NOTMUCH_TESTS:=$TESTS} @@ -58,13 +83,26 @@ 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 +echo ./aggregate-results.sh test-results/* +ev=$? # Clean up rm -rf test-results corpus.mail + +exit $ev