3a/567a22bb06fd5da563914eb9d750d2bad312b7

   1 Return-Path: <dmitry.kurochkin@gmail.com>\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 D2951429E2E\r
   6         for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:36:57 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id OrPMZ-BrEKJw for <notmuch@notmuchmail.org>;\r
  17         Sun, 27 Nov 2011 10:36:57 -0800 (PST)\r
  18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
  19         [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 49D52429E28\r
  22         for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:36:56 -0800 (PST)\r
  23 Received: by mail-bw0-f53.google.com with SMTP id q10so8006876bka.26\r
  24         for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:36:56 -0800 (PST)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
  27         bh=H1TwTunttUuBRw65qtbeWH+0T69kVTxUuyEthyOLLCM=;\r
  28         b=dKBwE51+zdJNhvUJmMQ1SwLEBaO/YVo+qOBxIKnRVNGlouGQ/vBGdUnZDfN6X0/5ci\r
  29         ghTKO3EHQfGJLxYKis0asNiHref9uUV4v/+FMTFdkXtjTSXNSEqEgEePikI+G++G8g+Z\r
  30         acCQNu2t/PZ9olcUU8rY4HDiVO89M24Cdqx60=\r
  31 Received: by 10.204.156.6 with SMTP id u6mr41108500bkw.135.1322419015980;\r
  32         Sun, 27 Nov 2011 10:36:55 -0800 (PST)\r
  33 Received: from localhost ([91.144.186.21])\r
  34         by mx.google.com with ESMTPS id cc2sm25119667bkb.8.2011.11.27.10.36.54\r
  35         (version=TLSv1/SSLv3 cipher=OTHER);\r
  36         Sun, 27 Nov 2011 10:36:55 -0800 (PST)\r
  37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v3 6/7] test: check if emacs is available in the beginning of\r
  40         test_emacs\r
  41 Date: Sun, 27 Nov 2011 22:36:18 +0400\r
  42 Message-Id: <1322418979-19180-7-git-send-email-dmitry.kurochkin@gmail.com>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1322418979-19180-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  45 References: <87pqgd7d23.fsf@rocinante.cs.unb.ca>\r
  46         <1322418979-19180-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  47 X-BeenThere: notmuch@notmuchmail.org\r
  48 X-Mailman-Version: 2.1.13\r
  49 Precedence: list\r
  50 List-Id: "Use and development of the notmuch mail system."\r
  51         <notmuch.notmuchmail.org>\r
  52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  53         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  55 List-Post: <mailto:notmuch@notmuchmail.org>\r
  56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  58         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  59 X-List-Received-Date: Sun, 27 Nov 2011 18:36:58 -0000\r
  60 \r
  61 Unfortunately, this is needed to avoid the emacs waiting loop.\r
  62 ---\r
  63  test/test-lib.sh |    4 ++++\r
  64  1 files changed, 4 insertions(+), 0 deletions(-)\r
  65 \r
  66 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  67 index 2422e32..11e6646 100644\r
  68 --- a/test/test-lib.sh\r
  69 +++ b/test/test-lib.sh\r
  70 @@ -894,6 +894,10 @@ EOF\r
  71  }\r
  72  \r
  73  test_emacs () {\r
  74 +       # test dependencies beforehand to avoid the waiting loop below\r
  75 +       test_require_external_prereq emacs || return\r
  76 +       test_require_external_prereq emacsclient || return\r
  77 +\r
  78         if [ -z "$EMACS_SERVER" ]; then\r
  79                 server_name="notmuch-test-suite-$$"\r
  80                 # start a detached session with an emacs server\r
  81 -- \r
  82 1.7.7.3\r
  83 \r