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