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

diff --git a/d9/c75a5e2ec4db5a20ac658ab09fd48b476e6935 b/d9/c75a5e2ec4db5a20ac658ab09fd48b476e6935
new file mode 100644 (file)
index 0000000..ac31e00
--- /dev/null
+++ b/d9/c75a5e2ec4db5a20ac658ab09fd48b476e6935
@@ -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 15373431FDB\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:31 -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 hrhclsFdT7uk for <notmuch@notmuchmail.org>;\r
+       Tue, 29 Jul 2014 09:48:25 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu\r
+       [18.9.25.13])\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 23D3F431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:21 -0700 (PDT)\r
+X-AuditID: 1209190d-f79c06d000002f07-73-53d7d053090c\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-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 5B.0D.12039.350D7D35; Tue, 29 Jul 2014 12:48:19 -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 s6TGmIxc030918; \r
+       Tue, 29 Jul 2014 12:48:18 -0400\r
+Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu\r
+       [128.31.33.71]) (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 s6TGmFlx030244\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 29 Jul 2014 12:48:17 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XCAZS-0007Gb-Lt; Tue, 29 Jul 2014 12:48:14 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 01/14] test: Include generated dependencies for test\r
+ sources\r
+Date: Tue, 29 Jul 2014 12:47:59 -0400\r
+Message-Id: <1406652492-27803-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+References: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrRt84Xqwwbk3yhar5/JYXL85k9mB\r
+       yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyuj9dpCx4Bp3xaTJE1kbGHdwdjFyckgImEjc\r
+       vbCaHcIWk7hwbz0biC0kMJtJYv3jwC5GLiB7I6PE91MnmSESx5gkfv1NhkjMZZR4umwRK0iC\r
+       TUBDYtv+5YwgtoiAtMTOu7PB4swCjhKf9y8Cmyos4C9x+kE7WA2LgKrEqy9TmLoYOTh4BRwk\r
+       Lp2SgzhCTqLhxiewck6g1lv37jJB7HWQODRrM8sERv4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz\r
+       8lKLdI30cjNL9FJTSjcxgoNIkncH47uDSocYBTgYlXh4ORZcCxZiTSwrrsw9xCjJwaQkyqu3\r
+       73qwEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRFevrNAOd6UxMqq1KJ8mJQ0B4uSOO9ba6tgIYH0\r
+       xJLU7NTUgtQimKwMB4eSBO/a80CNgkWp6akVaZk5JQhpJg5OkOE8QMP3gdTwFhck5hZnpkPk\r
+       TzEqSonzZp8DSgiAJDJK8+B6YVH+ilEc6BVh3jaQdh5ggoDrfgU0mAloMKsL2OCSRISUVAMj\r
+       v8SbCc8E/1zXPbrmz4Pbontans7u8rxd2Kb9tklVTvVxb99937pc7tufnH8fLtQqlVqyLsjM\r
+       42LjZOYvTpoRPoHTN96+9e+PqmbvvXmV/t2R/ut3rT3HuSd5clDRyZcsK9MttsZmMJpd1Vfa\r
+       tvrcyp27Pl95dtWvSFZJ/UKOyc4r5zj0/oR/UGIpzkg01GIuKk4EAIuOgpvNAgAA\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: Tue, 29 Jul 2014 16:48:31 -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