From: David Bremner <david@tethera.net>
Date: Sat, 8 Mar 2014 14:00:39 +0000 (+2000)
Subject: [PATCH] test: don't use $(dir) in recipes.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=62ca05aea0a5a71a94f18d9daa7693a9040facad;p=notmuch-archives.git

[PATCH] test: don't use $(dir) in recipes.
---

diff --git a/94/852549827b06213a72d07d872c081fb65e40e5 b/94/852549827b06213a72d07d872c081fb65e40e5
new file mode 100644
index 000000000..5e20c114f
--- /dev/null
+++ b/94/852549827b06213a72d07d872c081fb65e40e5
@@ -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 D555C431FBD
+	for <notmuch@notmuchmail.org>; Sat,  8 Mar 2014 06:00:52 -0800 (PST)
+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 T1abC5nHVEg6 for <notmuch@notmuchmail.org>;
+	Sat,  8 Mar 2014 06:00:48 -0800 (PST)
+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 2381A431FB6
+	for <notmuch@notmuchmail.org>; Sat,  8 Mar 2014 06:00:48 -0800 (PST)
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
+	(envelope-from <bremner@tethera.net>)
+	id 1WMHnx-0003Vi-Mb; Sat, 08 Mar 2014 10:00:45 -0400
+Received: (nullmailer pid 17893 invoked by uid 1000); Sat, 08 Mar 2014
+	14:00:41 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [PATCH] test: don't use $(dir) in recipes.
+Date: Sat,  8 Mar 2014 10:00:39 -0400
+Message-Id: <1394287239-17850-1-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 1.8.5.3
+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: Sat, 08 Mar 2014 14:00:53 -0000
+
+According the semantics of make, the expansion of $(dir) in recipes
+uses dynamic scope, i.e. the value at the time the recipe is run. This
+means if test/Makefile.local is not the last sub-makefile included,
+all heck breaks loose.
+---
+
+This was originally part of some suggested changes to Jani's folder
+series, but no reason to wait for Jani and I to sort that out.
+
+ test/Makefile.local | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/test/Makefile.local b/test/Makefile.local
+index 99324ba..36b1c1b 100644
+--- a/test/Makefile.local
++++ b/test/Makefile.local
+@@ -2,6 +2,8 @@
+ 
+ dir := test
+ 
++# save against changes in $(dir)
++test_src_dir := $(dir)
+ extra_cflags += -I.
+ 
+ smtp_dummy_srcs =		\
+@@ -45,7 +47,7 @@ TEST_BINARIES=$(dir)/arg-test \
+ test-binaries: $(TEST_BINARIES)
+ 
+ test:	all test-binaries
+-	@${dir}/notmuch-test $(OPTIONS)
++	@${test_src_dir}/notmuch-test $(OPTIONS)
+ 
+ check: test
+ 
+-- 
+1.8.5.3
+