ae/d66629122bad5715546b23643ffbade530be7d

   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 4E25A429E33\r
   6         for <notmuch@notmuchmail.org>; Sun, 26 Jun 2011 16:53:21 -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.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 t2qEyBAHXZLW for <notmuch@notmuchmail.org>;\r
  17         Sun, 26 Jun 2011 16:53:20 -0700 (PDT)\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 87AB5429E2E\r
  22         for <notmuch@notmuchmail.org>; Sun, 26 Jun 2011 16:53:18 -0700 (PDT)\r
  23 Received: by mail-bw0-f53.google.com with SMTP id 12so3882788bwg.26\r
  24         for <notmuch@notmuchmail.org>; Sun, 26 Jun 2011 16:53:18 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
  27         :in-reply-to:references;\r
  28         bh=zNty+7Hr7Wp4ZzZwhOQ1cuXfQpD0XKItXnWwo38pN3c=;\r
  29         b=lVZ8Wx0Apk/JUoNyqvRj49LbIce23cTtwhI+m/+yJYtBnyXhtEfO/6b585Ypj2HjCW\r
  30         hQFkkdPpjHIkwr/TgNQ+vMulyBCFmon3f2HGUcrOR+/ULG23kTBD6/FLeOH3PFVoibA6\r
  31         GHk+QlRaTZcHcKMvJaOrX/HYPq4ePSPCiwCfs=\r
  32 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
  33         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  34         b=OwmdJU6EuiFSk5tbHUduU4jHungQjvxWvlYd9Rs1soM9gwMLdECzTor+SbeUqRvnxD\r
  35         tvn7xQafGEGfcn5FOGIgFL5Z2O2zN1b8nQPadywMZGhbv0pGtcs4YWeVcV6+qglEI1HI\r
  36         cDajgCenukKoNab2GmBBVizzZWlB5YDWjgd3U=\r
  37 Received: by 10.204.134.207 with SMTP id k15mr3932825bkt.135.1309132398191;\r
  38         Sun, 26 Jun 2011 16:53:18 -0700 (PDT)\r
  39 Received: from localhost ([91.144.186.21])\r
  40         by mx.google.com with ESMTPS id g13sm1788582bkd.22.2011.06.26.16.53.16\r
  41         (version=TLSv1/SSLv3 cipher=OTHER);\r
  42         Sun, 26 Jun 2011 16:53:17 -0700 (PDT)\r
  43 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  44 To: notmuch@notmuchmail.org\r
  45 Subject: [PATCH 2/5] test: cleanup test_emacs\r
  46 Date: Mon, 27 Jun 2011 03:52:56 +0400\r
  47 Message-Id: <1309132379-24089-2-git-send-email-dmitry.kurochkin@gmail.com>\r
  48 X-Mailer: git-send-email 1.7.5.4\r
  49 In-Reply-To: <1309132379-24089-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  50 References: <1309132379-24089-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  51 X-BeenThere: notmuch@notmuchmail.org\r
  52 X-Mailman-Version: 2.1.13\r
  53 Precedence: list\r
  54 List-Id: "Use and development of the notmuch mail system."\r
  55         <notmuch.notmuchmail.org>\r
  56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  59 List-Post: <mailto:notmuch@notmuchmail.org>\r
  60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  63 X-List-Received-Date: Sun, 26 Jun 2011 23:53:22 -0000\r
  64 \r
  65 Move auxiliary function definition and configuration from command\r
  66 line to test-lib.el.\r
  67 ---\r
  68  test/test-lib.el |    8 ++++++++\r
  69  test/test-lib.sh |    9 +--------\r
  70  2 files changed, 9 insertions(+), 8 deletions(-)\r
  71 \r
  72 diff --git a/test/test-lib.el b/test/test-lib.el\r
  73 index 9439996..344a02e 100644\r
  74 --- a/test/test-lib.el\r
  75 +++ b/test/test-lib.el\r
  76 @@ -20,6 +20,14 @@\r
  77  ;;\r
  78  ;; Authors: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  79  \r
  80 +;; avoid crazy 10-column default of --batch\r
  81 +(set-frame-width (window-frame (get-buffer-window)) 80)\r
  82 +\r
  83 +(defun notmuch-test-wait ()\r
  84 +  "Wait for process completion."\r
  85 +  (while (get-buffer-process (current-buffer))\r
  86 +    (sleep-for 0.1)))\r
  87 +\r
  88  (defun visible-buffer-string ()\r
  89    "Same as `buffer-string', but excludes invisible text."\r
  90    (visible-buffer-substring (point-min) (point-max)))\r
  91 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  92 index 3ec388c..5f61960 100755\r
  93 --- a/test/test-lib.sh\r
  94 +++ b/test/test-lib.sh\r
  95 @@ -852,18 +852,11 @@ fi\r
  96  # --directory          Ensure that the local elisp sources are found\r
  97  #\r
  98  # --load               Force loading of notmuch.el and test-lib.el\r
  99 -#\r
 100 -# notmuch-test-wait    Function for tests to use to wait for process completion\r
 101 -#\r
 102 -# set-frame-width      80 columns (avoids crazy 10-column default of --batch)\r
 103  \r
 104  emacs \$BATCH --no-init-file --no-site-file \\r
 105         --directory ../../emacs --load notmuch.el \\r
 106         --directory .. --load test-lib.el \\r
 107 -       --eval "(defun notmuch-test-wait ()\r
 108 -                       (while (get-buffer-process (current-buffer))\r
 109 -                               (sleep-for 0.1)))" \\r
 110 -       --eval "(progn (set-frame-width (window-frame (get-buffer-window)) 80) \$@)"\r
 111 +       --eval "(progn \$@)"\r
 112  EOF\r
 113         chmod a+x ./run_emacs\r
 114         ./run_emacs "$@"\r
 115 -- \r
 116 1.7.5.4\r
 117 \r