On Sat, 14 Jan 2012 10:09:37 +0100, Pieter Praet <pieter@praet.org> wrote: > 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). looks good to me Regards, Dmitry > --- > test/test-lib.sh | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/test/test-lib.sh b/test/test-lib.sh > index 82767c0..d1fbc05 100644 > --- 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-$$" > -- > 1.7.8.1 >