test: don't bail out of `run_emacs' too early when missing prereqs
authorPieter Praet <pieter@praet.org>
Sat, 14 Jan 2012 09:09:37 +0000 (10:09 +0100)
committerDavid Bremner <bremner@debian.org>
Mon, 16 Jan 2012 02:37:07 +0000 (22:37 -0400)
When running the Emacs tests in verbose mode, only the first missing
prereq is reported because the `run_emacs' function is short-circuited
early:

  #+begin_example
    emacs: Testing emacs interface
     missing prerequisites: [0]  emacs(1)
     skipping test: [0]  Basic notmuch-hello view in emacs
     SKIP   [0]  Basic notmuch-hello view in emacs
  #+end_example

This can lead to situations reminiscent of "dependency hell", so instead
of returning based on each individual `test_require_external_prereq's exit
status, we now do so only after checking all the prereqs:

  #+begin_example
    emacs: Testing emacs interface
     missing prerequisites: [0]  dtach(1) emacs(1) emacsclient(1)
     skipping test: [0]  Basic notmuch-hello view in emacs
     SKIP   [0]  Basic notmuch-hello view in emacs
  #+end_example

Also added missing prereq for dtach(1).

test/test-lib.sh

index 82767c07ccf41ac3eb6cd964ce6bb783ba39dea9..d1fbc054dde05b11c9b7646146e97f0adcd6c5a5 100644 (file)
@@ -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-$$"