X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib.sh;h=6057238c7e3cc9f6880efd49e20923cf2d6c0140;hb=2a0a13a433e24076453da38f18d7d6053af34287;hp=72559cce303f5f268d7e8eb239ca1df4726aba6d;hpb=e32bb2009930e9daf0d8addfc584289abdd3332a;p=notmuch

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 72559cce..6057238c 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -368,6 +368,8 @@ generate_message ()
 	else
 	    template[subject]="Test message #${gen_msg_cnt}"
 	fi
+    elif [ "${template[subject]}" = "@FORCE_EMPTY" ]; then
+	template[subject]=""
     fi
 
     if [ -z "${template[date]}" ]; then
@@ -1139,7 +1141,7 @@ test_emacs () {
 	rm -f OUTPUT
 	touch OUTPUT
 
-	${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(progn $@)"
+	${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $@)"
 }
 
 test_python() {