From: Carl Worth <cworth@cworth.org>
Date: Tue, 7 Dec 2010 23:28:44 +0000 (-0800)
Subject: Revert "test: Break on test script (or other) error"
X-Git-Tag: debian/0.6_254~227
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=da805c4cdb4277cac089f0a1ef7d006abdf3b78d;hp=b41aab78f2380c79512b1ed953f77acd86414dfb

Revert "test: Break on test script (or other) error"

This reverts commit f22a7ec1e28d1264cf9d67d78796b8ab22e09a35.

Interrupting the test suite due to an actual bug in a test script
would be just fine, but interrupting the run of the entire test suite
at the first test failure is unacceptable.
---

diff --git a/test/notmuch-test b/test/notmuch-test
index 43565e87..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 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