X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=4889e49a88f94a67b8250a3fc04aa4226415cb37;hb=ac1ba43666456a85d59031beceed2c12ef23b777;hp=055467f45988556a4a53d569bddbda6e4bf99745;hpb=f22a7ec1e28d1264cf9d67d78796b8ab22e09a35;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index 055467f4..4889e49a 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -14,20 +14,12 @@ 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 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 -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
@@ -39,5 +31,3 @@ done
 
 # Clean up
 rm -r test-results corpus.mail
-
-trap '' 0