Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 67BDA429E45 for ; Sat, 14 Jan 2012 01:09:35 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uyLhQouYVxv8 for ; Sat, 14 Jan 2012 01:09:34 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 9F1B3431FB6 for ; Sat, 14 Jan 2012 01:09:34 -0800 (PST) Received: by wgbds11 with SMTP id ds11so3532902wgb.2 for ; Sat, 14 Jan 2012 01:09:33 -0800 (PST) Received: by 10.180.107.134 with SMTP id hc6mr7243807wib.21.1326532173480; Sat, 14 Jan 2012 01:09:33 -0800 (PST) Received: from localhost ([109.131.75.86]) by mx.google.com with ESMTPS id 28sm14178111wby.3.2012.01.14.01.09.32 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 14 Jan 2012 01:09:32 -0800 (PST) From: Pieter Praet To: Dmitry Kurochkin Subject: Re: [PATCH] test: don't bail out of `run_emacs' too early when missing prereqs In-Reply-To: <87zkdsg6ze.fsf@gmail.com> References: <87d3aolu61.fsf@praet.org> <1326388619-17422-1-git-send-email-pieter@praet.org> <87zkdsg6ze.fsf@gmail.com> User-Agent: Notmuch/0.10.2+115~gadd29f6 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-unknown-linux-gnu) Date: Sat, 14 Jan 2012 10:07:41 +0100 Message-ID: <87mx9qps82.fsf@praet.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Notmuch Mail X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2012 09:09:35 -0000 On Thu, 12 Jan 2012 21:34:29 +0400, Dmitry Kurochkin wrote: > On Thu, 12 Jan 2012 18:16:59 +0100, Pieter Praet 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 by checking $test_subtest_missing_external_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 add missing prereq for dtach(1). > > > > --- > > test/test-lib.sh | 6 ++++-- > > 1 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/test/test-lib.sh b/test/test-lib.sh > > index 82767c0..6ec3882 100644 > > --- a/test/test-lib.sh > > +++ b/test/test-lib.sh > > @@ -907,8 +907,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 > > + test_require_external_prereq dtach > > + test_require_external_prereq emacs > > + test_require_external_prereq emacsclient > > + test -z "$test_subtest_missing_external_prereqs_" || return > > There may be other missing dependencies before test_emacs() is called > and $test_subtest_missing_external_prereqs_ would not be blank. [...] True, hadn't though of that... > [...] Also, I > would like to keep the number of functions that use > $test_subtest_missing_external_prereqs_ minimal. [...] Could you elaborate on that? > [...] How about: > > missing_dependencies= > test_require_... dtach || missing_dependencies=1 > test_require_... emacs || missing_dependencies=1 > ... > test -z "$missing_dependencies" || return > Agreed! Patch follows. > Regards, > Dmitry > > > > > if [ -z "$EMACS_SERVER" ]; then > > server_name="notmuch-test-suite-$$" > > -- > > 1.7.8.1 > > Peace -- Pieter