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

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