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