From 310e76b67bf27cef3b23749d1993129866558cf1 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Wed, 12 Mar 2014 20:01:38 +2100 Subject: [PATCH] [Patch v6 12/14] test: add machinery to download and verify databases --- 0b/aef79feaf4b200268ad3756acf811813f5c84b | 142 ++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 0b/aef79feaf4b200268ad3756acf811813f5c84b diff --git a/0b/aef79feaf4b200268ad3756acf811813f5c84b b/0b/aef79feaf4b200268ad3756acf811813f5c84b new file mode 100644 index 000000000..0ce7fd645 --- /dev/null +++ b/0b/aef79feaf4b200268ad3756acf811813f5c84b @@ -0,0 +1,142 @@ +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 18C8A429E36 + for ; Tue, 11 Mar 2014 16:02:30 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 YSFNmL23BKrM for ; + Tue, 11 Mar 2014 16:02:26 -0700 (PDT) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 97AD4431FDF + for ; Tue, 11 Mar 2014 16:02:14 -0700 (PDT) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1WNVgc-0001vF-2f; Tue, 11 Mar 2014 20:02:14 -0300 +Received: (nullmailer pid 25863 invoked by uid 1000); Tue, 11 Mar 2014 + 23:01:46 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v6 12/14] test: add machinery to download and verify databases +Date: Tue, 11 Mar 2014 20:01:38 -0300 +Message-Id: <1394578900-25618-13-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.5.3 +In-Reply-To: <1394578900-25618-1-git-send-email-david@tethera.net> +References: <1394578900-25618-1-git-send-email-david@tethera.net> +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, 11 Mar 2014 23:02:30 -0000 + +Note that it is intentional that the checksum file is not +downloaded. The intent is to check those into git. +--- + Makefile | 3 ++- + test/README | 8 ++++++++ + test/T530-upgrade.sh | 2 +- + test/test-databases/Makefile | 7 +++++++ + test/test-databases/Makefile.local | 14 ++++++++++++++ + 5 files changed, 32 insertions(+), 2 deletions(-) + create mode 100644 test/test-databases/Makefile + create mode 100644 test/test-databases/Makefile.local + +diff --git a/Makefile b/Makefile +index f53bec0..061c55a 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,8 @@ all: + # List all subdirectories here. Each contains its own Makefile.local. + # Use of '=', without '+=', seems to be required for out-of-tree + # builds to work. +-subdirs = compat completion doc emacs lib parse-time-string performance-test util test ++subdirs = compat completion doc emacs lib parse-time-string \ ++ performance-test util test test/test-databases + + # We make all targets depend on the Makefiles themselves. + global_deps = Makefile Makefile.config Makefile.local \ +diff --git a/test/README b/test/README +index 79a9b1b..81a1c82 100644 +--- a/test/README ++++ b/test/README +@@ -64,6 +64,14 @@ The following command-line options are available when running tests: + Pointing this argument at a tmpfs filesystem can improve the + speed of the test suite for some users. + ++Certain tests require precomputed databases to complete. You can fetch these ++databases with ++ ++ make download-test-databases ++ ++If you do not download the test databases, the relevant tests will be ++skipped. ++ + When invoking the test suite via "make test" any of the above options + can be specified as follows: + +diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh +index 2139618..67bbf31 100755 +--- a/test/T530-upgrade.sh ++++ b/test/T530-upgrade.sh +@@ -7,7 +7,7 @@ dbtarball=database-v1.tar.xz + + # XXX: Accomplish the same with test lib helpers + if [ ! -e ${TEST_DIRECTORY}/test-databases/${dbtarball} ]; then +- test_subtest_missing_external_prereq_["${dbtarball}"]=t ++ test_subtest_missing_external_prereq_["${dbtarball} - fetch with 'make download-test-databases'"]=t + fi + + test_expect_success \ +diff --git a/test/test-databases/Makefile b/test/test-databases/Makefile +new file mode 100644 +index 0000000..b250a8b +--- /dev/null ++++ b/test/test-databases/Makefile +@@ -0,0 +1,7 @@ ++# See Makefile.local for the list of files to be compiled in this ++# directory. ++all: ++ $(MAKE) -C ../.. all ++ ++.DEFAULT: ++ $(MAKE) -C ../.. $@ +diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local +new file mode 100644 +index 0000000..0572e78 +--- /dev/null ++++ b/test/test-databases/Makefile.local +@@ -0,0 +1,14 @@ ++# -*- makefile -*- ++ ++TEST_DATABASE_MIRROR=http://notmuchmail.org/releases/test-databases ++ ++dir := test/test-databases ++ ++test_databases := $(dir)/database-v1.tar.xz ++ ++%.tar.xz: ++ wget -nv -O $@ ${TEST_DATABASE_MIRROR}/$(notdir $@); ++ ++download-test-databases: ${test_databases} ++ ++DISTCLEAN := $(DISTCLEAN) ${test_databases} +-- +1.8.5.3 + -- 2.26.2