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

diff --git a/4c/e2b57466156f3dc77d76e840b1ac0dd2d2c556 b/4c/e2b57466156f3dc77d76e840b1ac0dd2d2c556
new file mode 100644 (file)
index 0000000..08c180c
--- /dev/null
+++ b/4c/e2b57466156f3dc77d76e840b1ac0dd2d2c556
@@ -0,0 +1,103 @@
+Return-Path: <schnouki@schnouki.net>\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 69FB3421164\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 06:34:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1]\r
+       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 5azIkialImgM for <notmuch@notmuchmail.org>;\r
+       Wed, 16 Nov 2011 06:34:51 -0800 (PST)\r
+Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222])\r
+       by olra.theworths.org (Postfix) with ESMTP id 26339429E5C\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 06:34:26 -0800 (PST)\r
+Received: from thor.loria.fr (thor.loria.fr [152.81.12.250])\r
+       by ks3536.kimsufi.com (Postfix) with ESMTPSA id 459086A002E;\r
+       Wed, 16 Nov 2011 15:34:25 +0100 (CET)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net;\r
+       s=key-schnouki; t=1321454065;\r
+       bh=vFvZwQthgW+blb1XqSciYBYtBSLaljS5SRSRfSgoCw4=;\r
+       h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References;\r
+       b=P8p0pjuIlCEcCQ9TVlqLHoUyO+bR/nh5/Uo7g0qLbZKByuXSnrkFMyOdj1pDOOzP1\r
+       8pdATgyGUO8NlbBMSkOjScvkcSDe36IojJZDGujDt/MOQxDtgfpXVi110GSmpI3kT6\r
+       FrDqRms7tVp/VP6gVlfVpxOcolHwi3I9pvb9jyIk=\r
+From: Thomas Jost <schnouki@schnouki.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 6/6] test: add 'Emacs' prereq to dependent\r
+       'emacs-large-search-buffer' tests\r
+Date: Wed, 16 Nov 2011 15:33:55 +0100\r
+Message-Id: <1321454035-22023-7-git-send-email-schnouki@schnouki.net>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1321454035-22023-1-git-send-email-schnouki@schnouki.net>\r
+References: <1320176954-4897-1-git-send-email-pieter@praet.org>\r
+       <1321454035-22023-1-git-send-email-schnouki@schnouki.net>\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: Wed, 16 Nov 2011 14:34:53 -0000\r
+\r
+From: Pieter Praet <pieter@praet.org>\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
+Signed-off-by: Pieter Praet <pieter@praet.org>\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..63eb87c 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_set_bin_prereq dtach "dtach" DTACH\r
++test_have_prereq DTACH && test_set_bin_prereq emacs "Emacs" 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.3\r
+\r