From: Thomas Jost <schnouki@schnouki.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/6] test: check if emacs and dtach are available in
	test_emacs()
Date: Wed, 16 Nov 2011 15:33:51 +0100
Message-Id: <1321454035-22023-3-git-send-email-schnouki@schnouki.net>
In-Reply-To: <1321454035-22023-1-git-send-email-schnouki@schnouki.net>
References: <1320176954-4897-1-git-send-email-pieter@praet.org>
	<1321454035-22023-1-git-send-email-schnouki@schnouki.net>
Precedence: list

The test_emacs() function is run by the emacs tests even if the EMACS prereq is
not available. This causes an issue when running the test suite on a system
where dtach is not installed: the emacs server will not start, but since the
$EMACS_SERVER variable is set on the first call to test_emacs, subsequent calls
may result in attempts to run emacsclient, which will then report "can't find
socket".

This patch fixes this issue by making sure that dtach and emacs are available
before doing anything else in test_emacs().
---
 test/test-lib.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 382934f..ca1f412 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -852,6 +852,10 @@ EOF
 }
 
 test_emacs () {
+	# First check that emacs and dtach are available
+	hash emacs &>/dev/null || return
+	hash dtach &>/dev/null || return
+
 	if [ -z "$EMACS_SERVER" ]; then
 		EMACS_SERVER="notmuch-test-suite-$$"
 		# start a detached session with an emacs server
-- 
1.7.7.3