test: add function die () and have use of it in add_email_corpus ()

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 05e203d72992018b9270ee59712909a2dbe33ce3..4a8ef1f46b478b376728b3c15965fbddf9a4a9df 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -251,6 +251,16 @@ trap_signal () {
        exit $code
 }
 
+die () {
+       _exit_common
+       exec >&6
+       say_color error '%-6s' FATAL
+       echo " $*"
+       echo
+       echo "Unexpected exit while executing $0."
+       exit 1
+}
+
 GIT_EXIT_OK=
 # Note: TEST_TMPDIR *NOT* exported!
 TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
@@ -544,7 +554,7 @@ add_email_corpus ()
        cp -a $TEST_DIRECTORY/corpus.mail ${MAIL_DIR}
     else
        cp -a $TEST_DIRECTORY/corpus ${MAIL_DIR}
-       notmuch new >/dev/null
+       notmuch new >/dev/null || die "'notmuch new' failed while adding email corpus"
        cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpus.mail
     fi
 }