From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Sun, 27 Nov 2011 18:36:18 +0000 (+0400)
Subject: test: check if emacs is available in the beginning of test_emacs
X-Git-Tag: 0.11_rc1~86
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=5af65f65e8a32fb7f11f5b1c2036e35a4c4809e2

test: check if emacs is available in the beginning of test_emacs

Unfortunately, this is needed to avoid the emacs waiting loop.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 2422e32d..11e66465 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -894,6 +894,10 @@ EOF
 }
 
 test_emacs () {
+	# test dependencies beforehand to avoid the waiting loop below
+	test_require_external_prereq emacs || return
+	test_require_external_prereq emacsclient || return
+
 	if [ -z "$EMACS_SERVER" ]; then
 		server_name="notmuch-test-suite-$$"
 		# start a detached session with an emacs server