[PATCH 2/2] test-lib: Allow the user to override which emacs binary is used.

diff --git a/b7/9d7b5565075de1de04628c3a52d24db8c91d08 b/b7/9d7b5565075de1de04628c3a52d24db8c91d08
new file mode 100644 (file)
index 0000000..addebb3
--- /dev/null
+++ b/b7/9d7b5565075de1de04628c3a52d24db8c91d08
@@ -0,0 +1,77 @@
+Return-Path: <dme@dme.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 9CE58429E25\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Dec 2011 08:18:57 -0800 (PST)\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 7nPTf4i78icH for <notmuch@notmuchmail.org>;\r
+       Wed, 28 Dec 2011 08:18:57 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 03AA1431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Dec 2011 08:18:56 -0800 (PST)\r
+Received: by werm12 with SMTP id m12so7317683wer.26\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Dec 2011 08:18:54 -0800 (PST)\r
+Received: by 10.216.133.104 with SMTP id p82mr18153612wei.6.1325089134451;\r
+       Wed, 28 Dec 2011 08:18:54 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id z5sm75697894wix.5.2011.12.28.08.18.52\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 28 Dec 2011 08:18:53 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 3B630A091B; Wed, 28 Dec 2011 16:18:51 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test-lib: Allow the user to override which emacs binary\r
+       is used.\r
+Date: Wed, 28 Dec 2011 16:18:48 +0000\r
+Message-Id: <1325089128-32010-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1325089128-32010-1-git-send-email-dme@dme.org>\r
+References: <1325089128-32010-1-git-send-email-dme@dme.org>\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, 28 Dec 2011 16:18:57 -0000\r
+\r
+Specify when running the tests:\r
+       make EMACS=emacs23 test\r
+---\r
+ test/test-lib.sh |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 41a3144..53aa885 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -897,7 +897,7 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG\r
+ #\r
+ # --load              Force loading of notmuch.el and test-lib.el\r
+ \r
+-exec emacs --no-init-file --no-site-file \\r
++exec ${EMACS:-emacs} --no-init-file --no-site-file \\r
+       --no-window-system \\r
+       --directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \\r
+       --directory "$TEST_DIRECTORY" --load test-lib.el \\r
+-- \r
+1.7.7.3\r
+\r