[PATCH 07/10] emacs tests require emacs

diff --git a/05/bea9df85375cd7ae5d63f69e43a73c0e480cb8 b/05/bea9df85375cd7ae5d63f69e43a73c0e480cb8
new file mode 100644 (file)
index 0000000..694d2ee
--- /dev/null
+++ b/05/bea9df85375cd7ae5d63f69e43a73c0e480cb8
@@ -0,0 +1,172 @@
+Return-Path: <pioto@pioto.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 AD22F431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:07 -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 FO8LD5vPPV+U for <notmuch@notmuchmail.org>;\r
+       Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
+Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com\r
+       [209.85.220.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AA18B431FC3\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
+Received: by mail-vc0-f181.google.com with SMTP id f1so727472vcb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=jPMDTB3Qfm8Y2oama9QfEk54K5rrTr2iX4Kr3JKyj14=;\r
+       b=UYQBIiKD4zzX1cDJ33S/nIQUCd9UHyF9ZnEe4t85N/2DnO5MPwHUvsKO4RkVPgu7PP\r
+       PJNLvPM7ObXx/EWDG3VKNFF5hOxmjto1YZOiUPCxfIQgBik7tsY8tSwPEGm6vA/83zVi\r
+       J6j6xx9+4W5bxCY8nJbAhFFq8wViio+mZ+mtuyrllBVb2nyT1rzP8A7bNWe41OcO66vy\r
+       liEPkCORn1g7CtA7hZ5Jl7kGbRFGy5Is1l2TWuSdFnJs/h8AACP0DpT21yi7SWt3bvrI\r
+       eafUTeyOx3pKDfbEFItfxkioMmajoP1Uc5EKN1WYxpc1d5LeQDBE4RJyMPvxfTPamHsb\r
+       S/Aw==\r
+Received: by 10.220.141.207 with SMTP id n15mr3511905vcu.68.1337953446476;\r
+       Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id g10sm4254086vdk.2.2012.05.25.06.44.05\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 25 May 2012 06:44:05 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id 13CC0287C9; Fri, 25 May 2012 09:44:05 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 07/10] emacs tests require emacs\r
+Date: Fri, 25 May 2012 09:43:28 -0400\r
+Message-Id: <1337953411-21000-8-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+References: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQkyZbEgUSR8gjGiExjYTzsHV/PQIXJO1punyh0Gkpa8qkp9B+3oMxRlN9m9WdD2d31dm85y\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: Fri, 25 May 2012 13:44:07 -0000\r
+\r
+Immediately skip all emacs tests when we don't have emacs.\r
+---\r
+ test/emacs                     |    2 ++\r
+ test/emacs-address-cleaning    |    2 ++\r
+ test/emacs-hello               |    2 ++\r
+ test/emacs-large-search-buffer |    2 ++\r
+ test/emacs-show                |    2 ++\r
+ test/emacs-subject-to-filename |    2 ++\r
+ test/emacs-test-functions      |    2 ++\r
+ 7 files changed, 14 insertions(+)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index e9f954c..cc42b21 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -3,6 +3,8 @@\r
+ test_description="emacs interface"\r
+ . test-lib.sh\r
+ \r
++test_require_external_prereq emacs\r
++\r
+ EXPECTED=$TEST_DIRECTORY/emacs.expected-output\r
+ \r
+ add_email_corpus\r
+diff --git a/test/emacs-address-cleaning b/test/emacs-address-cleaning\r
+index 6ddde5c..9a189d5 100755\r
+--- a/test/emacs-address-cleaning\r
++++ b/test/emacs-address-cleaning\r
+@@ -3,6 +3,8 @@\r
+ test_description="emacs address cleaning"\r
+ . test-lib.sh\r
+ \r
++test_require_external_prereq emacs\r
++\r
+ test_begin_subtest "notmuch-test-address-clean part 1"\r
+ test_emacs_expect_t '(notmuch-test-address-cleaning-1)'\r
+ \r
+diff --git a/test/emacs-hello b/test/emacs-hello\r
+index a998dc4..b4ca831 100755\r
+--- a/test/emacs-hello\r
++++ b/test/emacs-hello\r
+@@ -3,6 +3,8 @@\r
+ test_description="Testing emacs notmuch-hello view"\r
+ . test-lib.sh\r
+ \r
++test_require_external_prereq emacs\r
++\r
+ EXPECTED=$TEST_DIRECTORY/emacs.expected-output\r
+ \r
+ add_email_corpus\r
+diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer\r
+index 4351e33..f5c8927 100755\r
+--- a/test/emacs-large-search-buffer\r
++++ b/test/emacs-large-search-buffer\r
+@@ -2,6 +2,8 @@\r
+ test_description="Emacs with large search results buffer"\r
+ . test-lib.sh\r
+ \r
++test_require_external_prereq emacs\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
+diff --git a/test/emacs-show b/test/emacs-show\r
+index 5700d2e..b2a5cb2 100755\r
+--- a/test/emacs-show\r
++++ b/test/emacs-show\r
+@@ -3,6 +3,8 @@\r
+ test_description="Testing emacs notmuch-show view"\r
+ . test-lib.sh\r
+ \r
++test_require_external_prereq emacs\r
++\r
+ test_begin_subtest "Hiding Original Message region at beginning of a message"\r
+ message_id='OriginalMessageHiding.1@notmuchmail.org'\r
+ add_message \\r
+diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename\r
+index 176e685..e8bc3ca 100755\r
+--- a/test/emacs-subject-to-filename\r
++++ b/test/emacs-subject-to-filename\r
+@@ -3,6 +3,8 @@\r
+ test_description="emacs: mail subject to filename"\r
+ . test-lib.sh\r
+ \r
++test_require_external_prereq emacs\r
++\r
+ # emacs server can't be started in a child process with $(test_emacs ...)\r
+ test_emacs '(ignore)'\r
+ \r
+diff --git a/test/emacs-test-functions b/test/emacs-test-functions\r
+index 0e1f9fc..dbbe7e4 100755\r
+--- a/test/emacs-test-functions\r
++++ b/test/emacs-test-functions\r
+@@ -3,6 +3,8 @@\r
+ test_description="emacs test function sanity"\r
+ . test-lib.sh\r
+ \r
++test_require_external_prereq emacs\r
++\r
+ test_begin_subtest "emacs test function sanity"\r
+ test_emacs_expect_t 't'\r
+ \r
+-- \r
+1.7.10.2\r
+\r