X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=b8437127c01fccc98c6f9be595f6cd1b8b0ebb5c;hp=53ce355cae1dfeed8bd09ef9ef5df46c82e3ebad;hb=e366bb222722d6a635b736e875b760d82b46d1f5;hpb=f0e0053149bb3b51f4a0cd43371292b639f236a8 diff --git a/test/notmuch-test b/test/notmuch-test index 53ce355c..b8437127 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -16,40 +16,7 @@ fi 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 - raw - reply - dump-restore - uuencode - thread-order - author-order - from-guessing - long-id - encoding - emacs - emacs-large-search-buffer - maildir-sync - crypto - symbol-hiding - search-folder-coherence - atomicity - python -" -TESTS=${NOTMUCH_TESTS:=$TESTS} +TESTS=${NOTMUCH_TESTS:-`echo T[0-9][0-9][0-9]-*.sh`} # Clean up any results from a previous run rm -r test-results >/dev/null 2>/dev/null @@ -67,11 +34,21 @@ trap 'e=$?; kill $!; exit $e' HUP INT TERM for test in $TESTS; do $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