X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib.sh;h=d1fbc054dde05b11c9b7646146e97f0adcd6c5a5;hb=d51b7842149dcaedd02c4e5b6ba74a5bccd926a9;hp=862095ccca4dc1c9358f4c5491c3c052d598b5bd;hpb=66ecd9063f041329d50f6ca2f9260e3b724eb868;p=notmuch diff --git a/test/test-lib.sh b/test/test-lib.sh index 862095cc..d1fbc054 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1,4 +1,3 @@ -#!/usr/bin/env bash # # Copyright (c) 2005 Junio C Hamano # @@ -908,8 +907,11 @@ EOF test_emacs () { # test dependencies beforehand to avoid the waiting loop below - test_require_external_prereq emacs || return - test_require_external_prereq emacsclient || return + missing_dependencies= + test_require_external_prereq dtach || missing_dependencies=1 + test_require_external_prereq emacs || missing_dependencies=1 + test_require_external_prereq emacsclient || missing_dependencies=1 + test -z "$missing_dependencies" || return if [ -z "$EMACS_SERVER" ]; then server_name="notmuch-test-suite-$$"