[Patch v3 15/15] test: add machinery to download and verify databases

diff --git a/45/22d4951867182a5dc50da7b8d8a0314fab5528 b/45/22d4951867182a5dc50da7b8d8a0314fab5528
new file mode 100644 (file)
index 0000000..ef0c22a
--- /dev/null
+++ b/45/22d4951867182a5dc50da7b8d8a0314fab5528
@@ -0,0 +1,156 @@
+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 1C7F6431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Mar 2014 13:20:21 -0800 (PST)\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 FBmf953zFurF for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Mar 2014 13:20:14 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 78C3C431FBF\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Mar 2014 13:20:13 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WMOfF-000580-23; Sat, 08 Mar 2014 17:20:13 -0400\r
+Received: (nullmailer pid 28556 invoked by uid 1000); Sat, 08 Mar 2014\r
+       21:20:03 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 15/15] test: add machinery to download and verify databases\r
+Date: Sat,  8 Mar 2014 17:19:45 -0400\r
+Message-Id: <1394313585-28422-16-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394313585-28422-1-git-send-email-david@tethera.net>\r
+References: <1394313585-28422-1-git-send-email-david@tethera.net>\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: Sat, 08 Mar 2014 21:20:21 -0000\r
+\r
+Note that it is intentional that the checksum file is not\r
+downloaded. The intent is to check those into git.\r
+---\r
+ Makefile                           |  3 ++-\r
+ test/Makefile.local                |  2 +-\r
+ test/README                        |  8 ++++++++\r
+ test/T530-upgrade.sh               |  2 +-\r
+ test/test-databases/Makefile       |  7 +++++++\r
+ test/test-databases/Makefile.local | 14 ++++++++++++++\r
+ 6 files changed, 33 insertions(+), 3 deletions(-)\r
+ create mode 100644 test/test-databases/Makefile\r
+ create mode 100644 test/test-databases/Makefile.local\r
+\r
+diff --git a/Makefile b/Makefile\r
+index 0428160..97084b1 100644\r
+--- a/Makefile\r
++++ b/Makefile\r
+@@ -5,7 +5,8 @@ all:\r
+ # List all subdirectories here. Each contains its own Makefile.local.\r
+ # Use of '=', without '+=', seems to be required for out-of-tree\r
+ # builds to work.\r
+-subdirs = compat completion emacs lib man parse-time-string performance-test util test\r
++subdirs = compat completion emacs lib man parse-time-string performance-test util test \\r
++      test/test-databases\r
+ \r
+ # We make all targets depend on the Makefiles themselves.\r
+ global_deps = Makefile Makefile.config Makefile.local \\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 40aa7d8..bfabd15 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -46,7 +46,7 @@ TEST_BINARIES=$(dir)/arg-test \\r
+ \r
+ test-binaries: $(TEST_BINARIES)\r
+ \r
+-test: all test-binaries\r
++test: all test-binaries fetch-test-databases\r
+       @${test_src_dir}/notmuch-test $(OPTIONS)\r
+ \r
+ check: test\r
+diff --git a/test/README b/test/README\r
+index 79a9b1b..81a1c82 100644\r
+--- a/test/README\r
++++ b/test/README\r
+@@ -64,6 +64,14 @@ The following command-line options are available when running tests:\r
+       Pointing this argument at a tmpfs filesystem can improve the\r
+       speed of the test suite for some users.\r
+ \r
++Certain tests require precomputed databases to complete. You can fetch these\r
++databases with\r
++\r
++      make download-test-databases\r
++\r
++If you do not download the test databases, the relevant tests will be\r
++skipped.\r
++\r
+ When invoking the test suite via "make test" any of the above options\r
+ can be specified as follows:\r
+ \r
+diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
+index a3c2ed1..e1e8ac5 100755\r
+--- a/test/T530-upgrade.sh\r
++++ b/test/T530-upgrade.sh\r
+@@ -7,7 +7,7 @@ dbtarball=folders-v1.tar.xz\r
+ \r
+ # XXX: Accomplish the same with test lib helpers\r
+ if [ ! -e ${TEST_DIRECTORY}/test-databases/${dbtarball} ]; then\r
+-    test_subtest_missing_external_prereq_["${dbtarball}"]=t\r
++    test_subtest_missing_external_prereq_["${dbtarball} - fetch with 'make download-test-databases'"]=t\r
+ fi\r
+ \r
+ test_expect_success \\r
+diff --git a/test/test-databases/Makefile b/test/test-databases/Makefile\r
+new file mode 100644\r
+index 0000000..b250a8b\r
+--- /dev/null\r
++++ b/test/test-databases/Makefile\r
+@@ -0,0 +1,7 @@\r
++# See Makefile.local for the list of files to be compiled in this\r
++# directory.\r
++all:\r
++      $(MAKE) -C ../.. all\r
++\r
++.DEFAULT:\r
++      $(MAKE) -C ../.. $@\r
+diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local\r
+new file mode 100644\r
+index 0000000..e777ada\r
+--- /dev/null\r
++++ b/test/test-databases/Makefile.local\r
+@@ -0,0 +1,14 @@\r
++# -*- makefile -*-\r
++\r
++TEST_DATABASE_MIRROR=http://notmuchmail.org/releases/test-databases\r
++\r
++dir := test/test-databases\r
++\r
++test_databases := $(dir)/folders-v1.tar.xz\r
++\r
++%.tar.xz:\r
++      wget -nv -O $@ ${TEST_DATABASE_MIRROR}/$(notdir $@);\r
++\r
++download-test-databases: ${test_databases}\r
++\r
++DISTCLEAN := $(DISTCLEAN) ${test_databases}\r
+-- \r
+1.8.5.3\r
+\r