d9/c75a5e2ec4db5a20ac658ab09fd48b476e6935

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 15373431FDB\r
   6         for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:31 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id hrhclsFdT7uk for <notmuch@notmuchmail.org>;\r
  16         Tue, 29 Jul 2014 09:48:25 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu\r
  18         [18.9.25.13])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 23D3F431FBC\r
  22         for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:21 -0700 (PDT)\r
  23 X-AuditID: 1209190d-f79c06d000002f07-73-53d7d053090c\r
  24 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 5B.0D.12039.350D7D35; Tue, 29 Jul 2014 12:48:19 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s6TGmIxc030918; \r
  31         Tue, 29 Jul 2014 12:48:18 -0400\r
  32 Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu\r
  33         [128.31.33.71]) (authenticated bits=0)\r
  34         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  35         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6TGmFlx030244\r
  36         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  37         Tue, 29 Jul 2014 12:48:17 -0400\r
  38 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  39         (envelope-from <amdragon@mit.edu>)\r
  40         id 1XCAZS-0007Gb-Lt; Tue, 29 Jul 2014 12:48:14 -0400\r
  41 From: Austin Clements <amdragon@MIT.EDU>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [PATCH v2 01/14] test: Include generated dependencies for test\r
  44  sources\r
  45 Date: Tue, 29 Jul 2014 12:47:59 -0400\r
  46 Message-Id: <1406652492-27803-2-git-send-email-amdragon@mit.edu>\r
  47 X-Mailer: git-send-email 2.0.0\r
  48 In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
  49 References: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
  50 X-Brightmail-Tracker:\r
  51  H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrRt84Xqwwbk3yhar5/JYXL85k9mB\r
  52         yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyuj9dpCx4Bp3xaTJE1kbGHdwdjFyckgImEjc\r
  53         vbCaHcIWk7hwbz0biC0kMJtJYv3jwC5GLiB7I6PE91MnmSESx5gkfv1NhkjMZZR4umwRK0iC\r
  54         TUBDYtv+5YwgtoiAtMTOu7PB4swCjhKf9y8Cmyos4C9x+kE7WA2LgKrEqy9TmLoYOTh4BRwk\r
  55         Lp2SgzhCTqLhxiewck6g1lv37jJB7HWQODRrM8sERv4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz\r
  56         8lKLdI30cjNL9FJTSjcxgoNIkncH47uDSocYBTgYlXh4ORZcCxZiTSwrrsw9xCjJwaQkyqu3\r
  57         73qwEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRFevrNAOd6UxMqq1KJ8mJQ0B4uSOO9ba6tgIYH0\r
  58         xJLU7NTUgtQimKwMB4eSBO/a80CNgkWp6akVaZk5JQhpJg5OkOE8QMP3gdTwFhck5hZnpkPk\r
  59         TzEqSonzZp8DSgiAJDJK8+B6YVH+ilEc6BVh3jaQdh5ggoDrfgU0mAloMKsL2OCSRISUVAMj\r
  60         v8SbCc8E/1zXPbrmz4Pbontans7u8rxd2Kb9tklVTvVxb99937pc7tufnH8fLtQqlVqyLsjM\r
  61         42LjZOYvTpoRPoHTN96+9e+PqmbvvXmV/t2R/ut3rT3HuSd5clDRyZcsK9MttsZmMJpd1Vfa\r
  62         tvrcyp27Pl95dtWvSFZJ/UKOyc4r5zj0/oR/UGIpzkg01GIuKk4EAIuOgpvNAgAA\r
  63 X-BeenThere: notmuch@notmuchmail.org\r
  64 X-Mailman-Version: 2.1.13\r
  65 Precedence: list\r
  66 List-Id: "Use and development of the notmuch mail system."\r
  67         <notmuch.notmuchmail.org>\r
  68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  71 List-Post: <mailto:notmuch@notmuchmail.org>\r
  72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  74         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  75 X-List-Received-Date: Tue, 29 Jul 2014 16:48:31 -0000\r
  76 \r
  77 Previously the build system was generating automatic header\r
  78 dependencies for test sources, but only smtp-dummy was in SRCS, so\r
  79 only its dependencies were being included.  Add all of the test\r
  80 sources to SRCS so that the root Makefile.local includes their\r
  81 dependencies.\r
  82 ---\r
  83  test/Makefile.local | 19 ++++++++++++-------\r
  84  1 file changed, 12 insertions(+), 7 deletions(-)\r
  85 \r
  86 diff --git a/test/Makefile.local b/test/Makefile.local\r
  87 index 1c85b18..916dd0b 100644\r
  88 --- a/test/Makefile.local\r
  89 +++ b/test/Makefile.local\r
  90 @@ -37,12 +37,17 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
  91  \r
  92  .PHONY: test check\r
  93  \r
  94 -TEST_BINARIES=$(dir)/arg-test \\r
  95 -             $(dir)/hex-xcode \\r
  96 -             $(dir)/random-corpus \\r
  97 -             $(dir)/parse-time \\r
  98 -             $(dir)/smtp-dummy \\r
  99 -             $(dir)/symbol-test\r
 100 +test_main_srcs=$(dir)/arg-test.c \\r
 101 +             $(dir)/hex-xcode.c \\r
 102 +             $(dir)/random-corpus.c \\r
 103 +             $(dir)/parse-time.c \\r
 104 +             $(dir)/smtp-dummy.c \\r
 105 +             $(dir)/symbol-test.cc \\r
 106 +\r
 107 +test_srcs=$(test_main_srcs) $(dir)/database-test.c\r
 108 +\r
 109 +TEST_BINARIES := $(test_main_srcs:.c=)\r
 110 +TEST_BINARIES := $(TEST_BINARIES:.cc=)\r
 111  \r
 112  test-binaries: $(TEST_BINARIES)\r
 113  \r
 114 @@ -51,7 +56,7 @@ test: all test-binaries\r
 115  \r
 116  check: test\r
 117  \r
 118 -SRCS := $(SRCS) $(smtp_dummy_srcs)\r
 119 +SRCS := $(SRCS) $(test_srcs)\r
 120  CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \\r
 121          $(dir)/database-test.o \\r
 122          $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*\r
 123 -- \r
 124 2.0.0\r
 125 \r