X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib.sh;h=93867b03c4e05bb96461ab767d2232a36ebb866f;hb=0da10aa1bc021bdf7fb43c818db1d59f28f30ecd;hp=87f78c999a14de58d4d325f76f615a944dac3217;hpb=a0ec104f13f66611b6e51cd9b49f4306f4fce8b7;p=notmuch

diff --git a/test/test-lib.sh b/test/test-lib.sh
old mode 100755
new mode 100644
index 87f78c99..93867b03
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -398,6 +398,8 @@ emacs_deliver_message ()
 	   (insert \"${body}\")
 	   $@
 	   (message-send-and-exit))"
+    # opportunistically quit smtp-dummy in case above fails.
+    { echo QUIT > /dev/tcp/localhost/25025; } 2>/dev/null
     wait ${smtp_dummy_pid}
     notmuch new >/dev/null
 }
@@ -847,7 +849,7 @@ test_emacs () {
 		# start a detached session with an emacs server
 		# user's TERM is given to dtach which assumes a minimally
 		# VT100-compatible terminal -- and emacs inherits that
-		TERM=$ORIGINAL_TERM dtach -n "$TMP_DIRECTORY/emacs-dtach-socket.$$" \
+		TERM=$ORIGINAL_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \
 			sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \
 				--no-window-system \
 				--eval '(setq server-name \"$EMACS_SERVER\")' \