[PATCH 01/14] test: Include generated dependencies for test sources

diff --git a/81/b6cdb2c1075c80e52473c9f0b28b9a897af9da b/81/b6cdb2c1075c80e52473c9f0b28b9a897af9da
new file mode 100644 (file)
index 0000000..0373a53
--- /dev/null
+++ b/81/b6cdb2c1075c80e52473c9f0b28b9a897af9da
@@ -0,0 +1,125 @@
+Return-Path: <amdragon@mit.edu>\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 E3CFF431FC3\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 QuVISg2kOIiW for <notmuch@notmuchmail.org>;\r
+       Sat, 26 Jul 2014 20:53:13 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
+       [18.7.68.35])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 73E03431FC4\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:07 -0700 (PDT)\r
+X-AuditID: 12074423-f79bf6d000007580-d9-53d4779f4a54\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 1D.64.30080.F9774D35; Sat, 26 Jul 2014 23:53:03 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s6R3r2Fh004150; \r
+       Sat, 26 Jul 2014 23:53:03 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6R3r0Qr016388\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 26 Jul 2014 23:53:02 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XBFW8-000517-67; Sat, 26 Jul 2014 23:53:00 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 01/14] test: Include generated dependencies for test sources\r
+Date: Sat, 26 Jul 2014 23:52:40 -0400\r
+Message-Id: <1406433173-19169-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrTu//Eqwwdp3yhbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXRu+3g4wF17grJk2eyNrAuIOzi5GTQ0LAROJTy1R2CFtM4sK9\r
+       9WxdjFwcQgKzmSQ6Ll9nhHA2Mkpcvb6YHcK5wySx+PtDqMxcRonJq1aC9bMJaEhs27+cEcQW\r
+       EZCW2Hl3NmsXIwcHs4CaxJ8uFRBTWMBH4sFEO5AKFgFViYd3zjGB2LwCDhLzPi9jg7hCTqLh\r
+       xicwm1PAUeL4sxNsIK1CQDW3LiVOYORfwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdMLzez\r
+       RC81pXQTIyhk2F2UdzD+Oah0iFGAg1GJhzeD7UqwEGtiWXFl7iFGSQ4mJVHe/WZAIb6k/JTK\r
+       jMTijPii0pzU4kOMEhzMSiK8QsVAOd6UxMqq1KJ8mJQ0B4uSOO9ba6tgIYH0xJLU7NTUgtQi\r
+       mKwMB4eSBO/0MqBGwaLU9NSKtMycEoQ0EwcnyHAeoOEbSkGGFxck5hZnpkPkTzEqSonz/gJJ\r
+       CIAkMkrz4HphMf2KURzoFWFeVpAVPMB0ANf9CmgwE9BgFv/LIINLEhFSUg2M0petDu5mv5u6\r
+       hM+n/M7bHQtEzx2641/Vdy1DRtBm40IZ7zWBPB+2L4pblffwt+7LFW0z5jB/7b9iWR2fu/rM\r
+       +eSUCTdeB+8P3vb23cbEpzfK+SxdLx4J4InddMFhUdSNTWu+Llxl/5zrrFWO6cNHftNCssxk\r
+       dyc06C6MnalgfvfHrWSvogh/ISWW4oxEQy3mouJEALEEi6/EAgAA\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: Sun, 27 Jul 2014 03:53:19 -0000\r
+\r
+Previously the build system was generating automatic header\r
+dependencies for test sources, but only smtp-dummy was in SRCS, so\r
+only its dependencies were being included.  Add all of the test\r
+sources to SRCS so that the root Makefile.local includes their\r
+dependencies.\r
+---\r
+ test/Makefile.local | 19 ++++++++++++-------\r
+ 1 file changed, 12 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 1c85b18..916dd0b 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -37,12 +37,17 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
+ \r
+ .PHONY: test check\r
+ \r
+-TEST_BINARIES=$(dir)/arg-test \\r
+-            $(dir)/hex-xcode \\r
+-            $(dir)/random-corpus \\r
+-            $(dir)/parse-time \\r
+-            $(dir)/smtp-dummy \\r
+-            $(dir)/symbol-test\r
++test_main_srcs=$(dir)/arg-test.c \\r
++            $(dir)/hex-xcode.c \\r
++            $(dir)/random-corpus.c \\r
++            $(dir)/parse-time.c \\r
++            $(dir)/smtp-dummy.c \\r
++            $(dir)/symbol-test.cc \\r
++\r
++test_srcs=$(test_main_srcs) $(dir)/database-test.c\r
++\r
++TEST_BINARIES := $(test_main_srcs:.c=)\r
++TEST_BINARIES := $(TEST_BINARIES:.cc=)\r
+ \r
+ test-binaries: $(TEST_BINARIES)\r
+ \r
+@@ -51,7 +56,7 @@ test:        all test-binaries\r
+ \r
+ check: test\r
+ \r
+-SRCS := $(SRCS) $(smtp_dummy_srcs)\r
++SRCS := $(SRCS) $(test_srcs)\r
+ CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \\r
+        $(dir)/database-test.o \\r
+        $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*\r
+-- \r
+2.0.0\r
+\r