X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=test%2Fnotmuch-test;h=055467f45988556a4a53d569bddbda6e4bf99745;hb=f22a7ec1e28d1264cf9d67d78796b8ab22e09a35;hp=b51045a7f278ef30567901c9b82b147a340d25a4;hpb=736ac42c45f62103e99ef18ef06b201d0bcd546f;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index b51045a7..055467f4 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -14,12 +14,20 @@ 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"
 
 # Clean up any results from a previous run
-rm -r test-results >/dev/null 2>/dev/null
+rm -rf test-results >/dev/null 2>/dev/null
 
 # Run the tests
 for test in $TESTS; do
@@ -31,3 +39,5 @@ done
 
 # Clean up
 rm -r test-results corpus.mail
+
+trap '' 0