From: David Bremner <david@tethera.net>
Date: Thu, 29 May 2014 00:26:27 +0000 (+2100)
Subject: [PATCH] test: use --quick when starting emacs.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=467fdeafe87c56d47e116cf51a021284ba804f8a;p=notmuch-archives.git

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

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