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 33909429E3C for ; Tue, 1 Nov 2011 12:50:48 -0700 (PDT) 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 t-OE9UmVmltz for ; Tue, 1 Nov 2011 12:50:47 -0700 (PDT) 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 A9C46429E3F for ; Tue, 1 Nov 2011 12:50:29 -0700 (PDT) Received: by wwe6 with SMTP id 6so2305952wwe.2 for ; Tue, 01 Nov 2011 12:50:28 -0700 (PDT) Received: by 10.227.204.204 with SMTP id fn12mr1190351wbb.21.1320177028246; Tue, 01 Nov 2011 12:50:28 -0700 (PDT) Received: from localhost ([109.131.187.47]) by mx.google.com with ESMTPS id en13sm13686wbb.22.2011.11.01.12.50.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Nov 2011 12:50:27 -0700 (PDT) From: Pieter Praet To: notmuch@notmuchmail.org Subject: [PATCH 4/4] test: add 'Emacs' prereq to dependent 'emacs-large-search-buffer' tests Date: Tue, 1 Nov 2011 20:49:14 +0100 Message-Id: <1320176954-4897-5-git-send-email-pieter@praet.org> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1320176954-4897-1-git-send-email-pieter@praet.org> References: <1320176954-4897-1-git-send-email-pieter@praet.org> 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: Tue, 01 Nov 2011 19:50:48 -0000 Adds a new test that checks for the presence of 'emacs', and adds that test as a prereq to all subsequent tests that rely on Emacs. This causes tests with unmet dependencies to be skipped. --- test/emacs-large-search-buffer | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer index 6095e9d..5757380 100755 --- a/test/emacs-large-search-buffer +++ b/test/emacs-large-search-buffer @@ -2,6 +2,11 @@ test_description="Emacs with large search results buffer" . test-lib.sh +# Emacs is a prereq. +test_expect_success "prereq: Emacs is present" "which emacs" \ + && test_set_prereq EMACS + + x=xxxxxxxxxx # 10 x=$x$x$x$x$x$x$x$x$x$x # 100 x=$x$x$x$x$x$x$x$x$x # 900 @@ -27,7 +32,7 @@ test_emacs '(notmuch-search "*") (notmuch-test-wait) (test-output)' sed -i -e s', *, ,g' -e 's/xxx*/[BLOB]/g' OUTPUT -test_expect_equal_file OUTPUT EXPEXTED +test_expect_equal_file EMACS OUTPUT EXPEXTED test_begin_subtest "Ensure that emacs doesn't drop error messages" test_emacs '(notmuch-search "--this-option-does-not-exist") @@ -38,6 +43,6 @@ Error: Unexpected output from notmuch search: Unrecognized option: --this-option-does-not-exist End of search results. (process returned 1) EOF -test_expect_equal_file OUTPUT EXPEXTED +test_expect_equal_file EMACS OUTPUT EXPEXTED test_done -- 1.7.7.1