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 F2897431FBD for ; Sun, 9 Mar 2014 23:25:06 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 pyr7RLEYuFGb for ; Sun, 9 Mar 2014 23:24:58 -0700 (PDT) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 646A3431FBC for ; Sun, 9 Mar 2014 23:24:58 -0700 (PDT) Received: by mail-ee0-f54.google.com with SMTP id d49so2911617eek.27 for ; Sun, 09 Mar 2014 23:24:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KAmHh6bYdUkNW/YM9wXxxHBbxWPUgF6rhlGdAhNa6/Q=; b=bSIINZUkJJj2ryWE/SlNSmVY4rGPuF5KPr5Sof2UtZ7G3P3IVWzau9/zOFtFq7CmW7 WMoMv8EdSa0zXSnlQLcWvSlkLxxwyWLEaelx7xTtp93n8DkTr0hebc/jVJlboUoDLxL+ QBZjNfgSIjDwA43gzzifdNXZ6FLv0rz0hsiqbNe1KiK8C2pCHebNpVrR03tfQakeeGsP lqmvJinafNz49wQWQ/M7PCLZVpmtrAA+4Lnr5Vq5uCadTZfZajD7RKqTj6ctb7S7GYcz UujhZEhuEd00+6YWlQqJ8KfVYPvlfzFXgwzliGK2dpEyDqUS1HdxghmvqrDJ/0GjKbRj vY0Q== X-Gm-Message-State: ALoCoQm+v0QhORQbfQopTqGmh1EZYJUCXhts3j9Bdg16IQ/HKJUqyxLmhyotYMjrYJxmAUyf0PFz X-Received: by 10.15.56.130 with SMTP id y2mr33295555eew.17.1394432693155; Sun, 09 Mar 2014 23:24:53 -0700 (PDT) Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi. [88.195.111.91]) by mx.google.com with ESMTPSA id o5sm41217913eeg.8.2014.03.09.23.24.51 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Mar 2014 23:24:52 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v5] test: add machinery to download and verify databases Date: Mon, 10 Mar 2014 08:24:50 +0200 Message-Id: <1394432690-3208-1-git-send-email-jani@nikula.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: References: 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: Mon, 10 Mar 2014 06:25:07 -0000 From: David Bremner 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 f53bec0ea401..061c55a1948a 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 79a9b1b2f9a1..81a1c82dcdbd 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 1d883986db83..6cbbb860998a 100755 --- a/test/T530-upgrade.sh +++ b/test/T530-upgrade.sh @@ -7,7 +7,7 @@ dbtarball=folders-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 000000000000..b250a8bea31d --- /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 000000000000..e777ada71667 --- /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)/folders-v1.tar.xz + +%.tar.xz: + wget -nv -O $@ ${TEST_DATABASE_MIRROR}/$(notdir $@); + +download-test-databases: ${test_databases} + +DISTCLEAN := $(DISTCLEAN) ${test_databases} -- 1.9.0