test: don't bail out of `run_emacs' too early when missing prereqs

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 82767c07ccf41ac3eb6cd964ce6bb783ba39dea9..d1fbc054dde05b11c9b7646146e97f0adcd6c5a5 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -907,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-$$"