[PATCH 4/4] test: add 'Emacs' prereq to dependent 'emacs-large-search-buffer' tests

diff --git a/66/b9ee32c5d942c57658a796e454967b2c1aca2d b/66/b9ee32c5d942c57658a796e454967b2c1aca2d
new file mode 100644 (file)
index 0000000..51bb509
--- /dev/null
+++ b/66/b9ee32c5d942c57658a796e454967b2c1aca2d
@@ -0,0 +1,98 @@
+Return-Path: <pieter@praet.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 33909429E3C\r
+       for <notmuch@notmuchmail.org>; Tue,  1 Nov 2011 12:50:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id t-OE9UmVmltz for <notmuch@notmuchmail.org>;\r
+       Tue,  1 Nov 2011 12:50:47 -0700 (PDT)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ A9C46429E3F   for <notmuch@notmuchmail.org>; Tue,  1 Nov 2011 12:50:29 -0700\r
+ (PDT)\r
+Received: by wwe6 with SMTP id 6so2305952wwe.2\r
+       for <notmuch@notmuchmail.org>; Tue, 01 Nov 2011 12:50:28 -0700 (PDT)\r
+Received: by 10.227.204.204 with SMTP id fn12mr1190351wbb.21.1320177028246;\r
+       Tue, 01 Nov 2011 12:50:28 -0700 (PDT)\r
+Received: from localhost ([109.131.187.47])\r
+       by mx.google.com with ESMTPS id en13sm13686wbb.22.2011.11.01.12.50.27\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 01 Nov 2011 12:50:27 -0700 (PDT)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/4] test: add 'Emacs' prereq to dependent\r
+       'emacs-large-search-buffer' tests\r
+Date: Tue,  1 Nov 2011 20:49:14 +0100\r
+Message-Id: <1320176954-4897-5-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.7.1\r
+In-Reply-To: <1320176954-4897-1-git-send-email-pieter@praet.org>\r
+References: <1320176954-4897-1-git-send-email-pieter@praet.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 01 Nov 2011 19:50:48 -0000\r
+\r
+Adds a new test that checks for the presence of 'emacs',\r
+and adds that test as a prereq to all subsequent tests\r
+that rely on Emacs.\r
+\r
+This causes tests with unmet dependencies to be skipped.\r
+\r
+---\r
+ test/emacs-large-search-buffer |    9 +++++++--\r
+ 1 files changed, 7 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer\r
+index 6095e9d..5757380 100755\r
+--- a/test/emacs-large-search-buffer\r
++++ b/test/emacs-large-search-buffer\r
+@@ -2,6 +2,11 @@\r
+ test_description="Emacs with large search results buffer"\r
+ . test-lib.sh\r
+ \r
++# Emacs is a prereq.\r
++test_expect_success "prereq: Emacs is present" "which emacs" \\r
++    && test_set_prereq EMACS\r
++\r
++\r
+ x=xxxxxxxxxx # 10\r
+ x=$x$x$x$x$x$x$x$x$x$x # 100\r
+ x=$x$x$x$x$x$x$x$x$x # 900\r
+@@ -27,7 +32,7 @@ test_emacs '(notmuch-search "*")\r
+           (notmuch-test-wait)\r
+           (test-output)'\r
+ sed -i -e s',  *, ,g' -e 's/xxx*/[BLOB]/g' OUTPUT\r
+-test_expect_equal_file OUTPUT EXPEXTED\r
++test_expect_equal_file EMACS OUTPUT EXPEXTED\r
+ \r
+ test_begin_subtest "Ensure that emacs doesn't drop error messages"\r
+ test_emacs '(notmuch-search "--this-option-does-not-exist")\r
+@@ -38,6 +43,6 @@ Error: Unexpected output from notmuch search:\r
+ Unrecognized option: --this-option-does-not-exist\r
+ End of search results. (process returned 1)\r
+ EOF\r
+-test_expect_equal_file OUTPUT EXPEXTED\r
++test_expect_equal_file EMACS OUTPUT EXPEXTED\r
+ \r
+ test_done\r
+-- \r
+1.7.7.1\r
+\r