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 D1F9D429E26 for ; Thu, 12 Jan 2012 09:35:23 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, 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 i5-rak7gLWjg for ; Thu, 12 Jan 2012 09:35:23 -0800 (PST) Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 2E6E7429E27 for ; Thu, 12 Jan 2012 09:35:23 -0800 (PST) Received: by bkat2 with SMTP id t2so1653030bka.26 for ; Thu, 12 Jan 2012 09:35:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=nq5aZU7RceQd+fQn81ygi/xlY3zHpxz18O9DNt58Pyk=; b=PwBOq5eOVADHy7iFI/psderPhxaGy9TB+O1ftxRK0rwAO4Fx1F5xO33vZsHrfpecQh D6r6vN/iJGLV5spGuLMJuAwsJR8H7BX7BfehGptYQeGHwrZeMHtUE/w8iihz77qH1DQQ NGOUHroe8wxQ+3dWc/qX//wHnuKNBWHpp/NT0= Received: by 10.204.148.88 with SMTP id o24mr1602514bkv.39.1326389720522; Thu, 12 Jan 2012 09:35:20 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id a17sm12109088bkz.7.2012.01.12.09.35.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Jan 2012 09:35:20 -0800 (PST) From: Dmitry Kurochkin To: Pieter Praet Subject: Re: [PATCH] test: don't bail out of `run_emacs' too early when missing prereqs In-Reply-To: <1326388619-17422-1-git-send-email-pieter@praet.org> References: <87d3aolu61.fsf@praet.org> <1326388619-17422-1-git-send-email-pieter@praet.org> User-Agent: Notmuch/0.10.2+135~gb811a3c (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Thu, 12 Jan 2012 21:34:29 +0400 Message-ID: <87zkdsg6ze.fsf@gmail.com> 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: Thu, 12 Jan 2012 17:35:24 -0000 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. Also, I would like to keep the number of functions that use $test_subtest_missing_external_prereqs_ minimal. How about: missing_dependencies= test_require_... dtach || missing_dependencies=1 test_require_... emacs || missing_dependencies=1 ... test -z "$missing_dependencies" || return Regards, Dmitry > > if [ -z "$EMACS_SERVER" ]; then > server_name="notmuch-test-suite-$$" > -- > 1.7.8.1 >