05/bea9df85375cd7ae5d63f69e43a73c0e480cb8

   1 Return-Path: <pioto@pioto.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id AD22F431FBC\r
   6         for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:07 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id FO8LD5vPPV+U for <notmuch@notmuchmail.org>;\r
  16         Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
  17 Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com\r
  18         [209.85.220.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id AA18B431FC3\r
  21         for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
  22 Received: by mail-vc0-f181.google.com with SMTP id f1so727472vcb.26\r
  23         for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=google.com; s=20120113;\r
  26         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
  27         :x-gm-message-state;\r
  28         bh=jPMDTB3Qfm8Y2oama9QfEk54K5rrTr2iX4Kr3JKyj14=;\r
  29         b=UYQBIiKD4zzX1cDJ33S/nIQUCd9UHyF9ZnEe4t85N/2DnO5MPwHUvsKO4RkVPgu7PP\r
  30         PJNLvPM7ObXx/EWDG3VKNFF5hOxmjto1YZOiUPCxfIQgBik7tsY8tSwPEGm6vA/83zVi\r
  31         J6j6xx9+4W5bxCY8nJbAhFFq8wViio+mZ+mtuyrllBVb2nyT1rzP8A7bNWe41OcO66vy\r
  32         liEPkCORn1g7CtA7hZ5Jl7kGbRFGy5Is1l2TWuSdFnJs/h8AACP0DpT21yi7SWt3bvrI\r
  33         eafUTeyOx3pKDfbEFItfxkioMmajoP1Uc5EKN1WYxpc1d5LeQDBE4RJyMPvxfTPamHsb\r
  34         S/Aw==\r
  35 Received: by 10.220.141.207 with SMTP id n15mr3511905vcu.68.1337953446476;\r
  36         Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
  37 Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
  38         [71.182.155.97])\r
  39         by mx.google.com with ESMTPS id g10sm4254086vdk.2.2012.05.25.06.44.05\r
  40         (version=TLSv1/SSLv3 cipher=OTHER);\r
  41         Fri, 25 May 2012 06:44:05 -0700 (PDT)\r
  42 Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
  43         id 13CC0287C9; Fri, 25 May 2012 09:44:05 -0400 (EDT)\r
  44 From: Mike Kelly <pioto@pioto.org>\r
  45 To: notmuch@notmuchmail.org\r
  46 Subject: [PATCH 07/10] emacs tests require emacs\r
  47 Date: Fri, 25 May 2012 09:43:28 -0400\r
  48 Message-Id: <1337953411-21000-8-git-send-email-pioto@pioto.org>\r
  49 X-Mailer: git-send-email 1.7.10.2\r
  50 In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
  51 References: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
  52 X-Gm-Message-State:\r
  53  ALoCoQkyZbEgUSR8gjGiExjYTzsHV/PQIXJO1punyh0Gkpa8qkp9B+3oMxRlN9m9WdD2d31dm85y\r
  54 X-BeenThere: notmuch@notmuchmail.org\r
  55 X-Mailman-Version: 2.1.13\r
  56 Precedence: list\r
  57 List-Id: "Use and development of the notmuch mail system."\r
  58         <notmuch.notmuchmail.org>\r
  59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  60         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  62 List-Post: <mailto:notmuch@notmuchmail.org>\r
  63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  66 X-List-Received-Date: Fri, 25 May 2012 13:44:07 -0000\r
  67 \r
  68 Immediately skip all emacs tests when we don't have emacs.\r
  69 ---\r
  70  test/emacs                     |    2 ++\r
  71  test/emacs-address-cleaning    |    2 ++\r
  72  test/emacs-hello               |    2 ++\r
  73  test/emacs-large-search-buffer |    2 ++\r
  74  test/emacs-show                |    2 ++\r
  75  test/emacs-subject-to-filename |    2 ++\r
  76  test/emacs-test-functions      |    2 ++\r
  77  7 files changed, 14 insertions(+)\r
  78 \r
  79 diff --git a/test/emacs b/test/emacs\r
  80 index e9f954c..cc42b21 100755\r
  81 --- a/test/emacs\r
  82 +++ b/test/emacs\r
  83 @@ -3,6 +3,8 @@\r
  84  test_description="emacs interface"\r
  85  . test-lib.sh\r
  86  \r
  87 +test_require_external_prereq emacs\r
  88 +\r
  89  EXPECTED=$TEST_DIRECTORY/emacs.expected-output\r
  90  \r
  91  add_email_corpus\r
  92 diff --git a/test/emacs-address-cleaning b/test/emacs-address-cleaning\r
  93 index 6ddde5c..9a189d5 100755\r
  94 --- a/test/emacs-address-cleaning\r
  95 +++ b/test/emacs-address-cleaning\r
  96 @@ -3,6 +3,8 @@\r
  97  test_description="emacs address cleaning"\r
  98  . test-lib.sh\r
  99  \r
 100 +test_require_external_prereq emacs\r
 101 +\r
 102  test_begin_subtest "notmuch-test-address-clean part 1"\r
 103  test_emacs_expect_t '(notmuch-test-address-cleaning-1)'\r
 104  \r
 105 diff --git a/test/emacs-hello b/test/emacs-hello\r
 106 index a998dc4..b4ca831 100755\r
 107 --- a/test/emacs-hello\r
 108 +++ b/test/emacs-hello\r
 109 @@ -3,6 +3,8 @@\r
 110  test_description="Testing emacs notmuch-hello view"\r
 111  . test-lib.sh\r
 112  \r
 113 +test_require_external_prereq emacs\r
 114 +\r
 115  EXPECTED=$TEST_DIRECTORY/emacs.expected-output\r
 116  \r
 117  add_email_corpus\r
 118 diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer\r
 119 index 4351e33..f5c8927 100755\r
 120 --- a/test/emacs-large-search-buffer\r
 121 +++ b/test/emacs-large-search-buffer\r
 122 @@ -2,6 +2,8 @@\r
 123  test_description="Emacs with large search results buffer"\r
 124  . test-lib.sh\r
 125  \r
 126 +test_require_external_prereq emacs\r
 127 +\r
 128  x=xxxxxxxxxx # 10\r
 129  x=$x$x$x$x$x$x$x$x$x$x # 100\r
 130  x=$x$x$x$x$x$x$x$x$x # 900\r
 131 diff --git a/test/emacs-show b/test/emacs-show\r
 132 index 5700d2e..b2a5cb2 100755\r
 133 --- a/test/emacs-show\r
 134 +++ b/test/emacs-show\r
 135 @@ -3,6 +3,8 @@\r
 136  test_description="Testing emacs notmuch-show view"\r
 137  . test-lib.sh\r
 138  \r
 139 +test_require_external_prereq emacs\r
 140 +\r
 141  test_begin_subtest "Hiding Original Message region at beginning of a message"\r
 142  message_id='OriginalMessageHiding.1@notmuchmail.org'\r
 143  add_message \\r
 144 diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename\r
 145 index 176e685..e8bc3ca 100755\r
 146 --- a/test/emacs-subject-to-filename\r
 147 +++ b/test/emacs-subject-to-filename\r
 148 @@ -3,6 +3,8 @@\r
 149  test_description="emacs: mail subject to filename"\r
 150  . test-lib.sh\r
 151  \r
 152 +test_require_external_prereq emacs\r
 153 +\r
 154  # emacs server can't be started in a child process with $(test_emacs ...)\r
 155  test_emacs '(ignore)'\r
 156  \r
 157 diff --git a/test/emacs-test-functions b/test/emacs-test-functions\r
 158 index 0e1f9fc..dbbe7e4 100755\r
 159 --- a/test/emacs-test-functions\r
 160 +++ b/test/emacs-test-functions\r
 161 @@ -3,6 +3,8 @@\r
 162  test_description="emacs test function sanity"\r
 163  . test-lib.sh\r
 164  \r
 165 +test_require_external_prereq emacs\r
 166 +\r
 167  test_begin_subtest "emacs test function sanity"\r
 168  test_emacs_expect_t 't'\r
 169  \r
 170 -- \r
 171 1.7.10.2\r
 172 \r