Merge branch 'release'

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 2422e32d9ece07aae03871fb0c81ea7b2825608c..a97595707bf1dba13a72108afd8863af9d64dafa 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -554,10 +554,10 @@ test_declare_external_prereq () {
        test "$#" = 2 && name=$2 || name="$binary(1)"
 
        hash $binary 2>/dev/null || eval "
-$binary () {
        test_missing_external_prereq_${binary}_=t
-       echo -n \"\$test_subtest_missing_external_prereqs_\" | grep -e \" $name \" ||
-       test_subtest_missing_external_prereqs_=\"$test_subtest_missing_external_prereqs_ $name\"
+$binary () {
+       echo -n \"\$test_subtest_missing_external_prereqs_ \" | grep -qe \" $name \" ||
+       test_subtest_missing_external_prereqs_=\"\$test_subtest_missing_external_prereqs_ $name\"
        false
 }"
 }
@@ -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