test: force deletion of test remnants

[notmuch] / test / notmuch-test

diff --git a/test/notmuch-test b/test/notmuch-test
index 055467f45988556a4a53d569bddbda6e4bf99745..0ea4f4f732534ca68be1430c7cebd131a032beaf 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -14,20 +14,36 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     exit 1
 fi
 
-set -e
-
-die () {
-    echo >&2 "Unexpected failure"
-}
-
-trap 'die' 0
-
 cd $(dirname "$0")
 
-TESTS="basic new search json thread-naming raw reply dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs maildir-sync"
+TESTS="
+  basic
+  new
+  search
+  search-output
+  search-by-folder
+  search-position-overlap-bug
+  search-insufficient-from-quoting
+  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
+"
+TESTS=${NOTMUCH_TESTS:=$TESTS}
 
 # Clean up any results from a previous run
-rm -rf test-results >/dev/null 2>/dev/null
+rm -r test-results >/dev/null 2>/dev/null
 
 # Run the tests
 for test in $TESTS; do
@@ -38,6 +54,4 @@ done
 ./aggregate-results.sh test-results/*
 
 # Clean up
-rm -r test-results corpus.mail
-
-trap '' 0
+rm -rf test-results corpus.mail