[PATCH] test: use --quick when starting emacs.

diff --git a/0e/dffbaccab9bde671ee5892fa06cd7753f9be73 b/0e/dffbaccab9bde671ee5892fa06cd7753f9be73
new file mode 100644 (file)
index 0000000..962ec3f
--- /dev/null
+++ b/0e/dffbaccab9bde671ee5892fa06cd7753f9be73
@@ -0,0 +1,83 @@
+Return-Path: <bremner@tethera.net>\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 99748431FBD\r
+       for <notmuch@notmuchmail.org>; Wed, 28 May 2014 17:26:59 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 7WXdnj1SozKL for <notmuch@notmuchmail.org>;\r
+       Wed, 28 May 2014 17:26:54 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2CD0B431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 28 May 2014 17:26:54 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WpoBF-0001WY-OQ; Wed, 28 May 2014 21:26:49 -0300\r
+Received: (nullmailer pid 17857 invoked by uid 1000); Thu, 29 May 2014\r
+       00:26:46 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: use --quick when starting emacs.\r
+Date: Wed, 28 May 2014 21:26:27 -0300\r
+Message-Id: <1401323187-17799-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.0.0.rc2\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: Thu, 29 May 2014 00:26:59 -0000\r
+\r
+At least in emacs24, this removes the "site-lisp" directories from the\r
+load path in addition to enforcing --no-site-lisp --no-init-file.\r
+\r
+This works around a slightly mysterious bug on Debian that causes\r
+test-lib.el not to load when there is cl-lib.el(c) in some site-lisp\r
+directory.  It should be harmless in general since we really don't\r
+want to load any files from addon packages to emacs.\r
+---\r
+ test/test-lib.sh | 7 +++----\r
+ 1 file changed, 3 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 8697d6a..17deaab 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1081,15 +1081,14 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG\r
+ \r
+ # Here's what we are using here:\r
+ #\r
+-# --no-init-file      Don't load users ~/.emacs\r
+-#\r
+-# --no-site-file      Don't load the site-wide startup stuff\r
++# --quick              Use minimal customization. This implies --no-init-file,\r
++#                    --no-site-file and (emacs 24) --no-site-lisp\r
+ #\r
+ # --directory         Ensure that the local elisp sources are found\r
+ #\r
+ # --load              Force loading of notmuch.el and test-lib.el\r
+ \r
+-exec ${TEST_EMACS} --no-init-file --no-site-file \\r
++exec ${TEST_EMACS} --quick \\r
+       --directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \\r
+       --directory "$TEST_DIRECTORY" --load test-lib.el \\r
+       "\$@"\r
+-- \r
+2.0.0.rc2\r
+\r