aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sojka <sojkam1@fel.cvut.cz>2015-12-29 09:52:17 +0100
committerDavid Bremner <david@tethera.net>2015-12-30 11:28:30 -0400
commita9fec12a0804113596c927d45f627f8b874aab67 (patch)
tree322cefceee64dedf30bb0ad94d53b025e5385c19
parentc2dfaccc9080f819a4ab3739ded7485044993ad4 (diff)
test: Unset ALTERNATE_EDITOR before running emacsclient
ALTERNATE_EDITOR causes emacsclient to run an alternate editor if the emacs server is not ready. This can collide with intended functionality in test-lib.sh. If the ALTERNATE_EDITOR is set but empty, emacsclient runs emacs daemon and tries to connect to it. When this happens the emacs run by test-lib.sh fails to start the server and the subsequent attempts to use the server fail because the daemon started by emacsclient does not know about notmuch-test-progn. This leads to test suite failure due to time out on any emacs test.
-rw-r--r--test/test-lib.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 126911fb..270c718b 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -82,6 +82,9 @@ unset CDPATH
unset GREP_OPTIONS
+# For emacsclient
+unset ALTERNATE_EDITOR
+
# Convenience
#
# A regexp to match 5 and 40 hexdigits