[PATCH 1/3] build system: remove directories created by tests in "make clean"

diff --git a/89/551c20e1f29413617ef450f2af404c00edbdd6 b/89/551c20e1f29413617ef450f2af404c00edbdd6
new file mode 100644 (file)
index 0000000..590da98
--- /dev/null
+++ b/89/551c20e1f29413617ef450f2af404c00edbdd6
@@ -0,0 +1,95 @@
+Return-Path: <bremner@tethera.net>\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 6161F429E29\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 06:22:59 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 mTTN6j8h+7yc for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Aug 2012 06:22:58 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A8D99431FDE\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 06:22:54 -0700 (PDT)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1SwvMb-0003L6-Oj; Thu, 02 Aug 2012 10:22:53 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1SwvMW-0006A4-At; Thu, 02 Aug 2012 10:22:48 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] build system: remove directories created by tests in\r
+       "make clean"\r
+Date: Thu,  2 Aug 2012 10:22:35 -0300\r
+Message-Id: <1343913757-23472-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1343913757-23472-1-git-send-email-david@tethera.net>\r
+References: <m2ipd28td8.fsf@guru.guru-group.fi>\r
+       <1343913757-23472-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\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: Thu, 02 Aug 2012 13:23:00 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+These extra directories cause problems for building on Debian twice in\r
+a row.\r
+\r
+In order to remove directories, we need to us "rm -rf" instead of "rm\r
+-r". So now we should be extra careful what we add to the variable CLEAN.\r
+---\r
+ Makefile.local      |    2 +-\r
+ test/Makefile.local |    3 ++-\r
+ 2 files changed, 3 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 296995d..6d6896a 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -265,7 +265,7 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))\r
+ \r
+ .PHONY : clean\r
+ clean:\r
+-      rm -f $(CLEAN); rm -rf .deps\r
++      rm -rf $(CLEAN); rm -rf .deps\r
+ \r
+ # We don't (yet) have any distributed files not in the upstream repository.\r
+ # So distclean is currently identical to clean.\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 4a6a4b1..c7f1435 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -31,4 +31,5 @@ check: test\r
+ SRCS := $(SRCS) $(smtp_dummy_srcs)\r
+ CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \\r
+        $(dir)/symbol-test $(dir)/symbol-test.o \\r
+-       $(dir)/arg-test $(dir)/arg-test.o\r
++       $(dir)/arg-test $(dir)/arg-test.o \\r
++       $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*\r
+-- \r
+1.7.10.4\r
+\r