aboutsummaryrefslogtreecommitdiff
path: root/test/test-lib.sh
diff options
context:
space:
mode:
authorDmitry Kurochkin <dmitry.kurochkin@gmail.com>2011-11-27 22:36:18 +0400
committerDavid Bremner <bremner@debian.org>2011-11-27 11:33:13 -0800
commit5af65f65e8a32fb7f11f5b1c2036e35a4c4809e2 (patch)
treebacdf6de03b0eda9eb3c7fba35ce0a8a46236a64 /test/test-lib.sh
parentf0fbdad04bd60990ed556232a3acd61cd1c60fcf (diff)
test: check if emacs is available in the beginning of test_emacs
Unfortunately, this is needed to avoid the emacs waiting loop.
Diffstat (limited to 'test/test-lib.sh')
-rw-r--r--test/test-lib.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 2422e32..11e6646 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