72/75c6f7bf61d70f019ea96f37db4a0a5cd4ce03

   1 Return-Path: <jani@nikula.org>\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 F2897431FBD\r
   6         for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 23:25:06 -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: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 pyr7RLEYuFGb for <notmuch@notmuchmail.org>;\r
  16         Sun,  9 Mar 2014 23:24:58 -0700 (PDT)\r
  17 Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com\r
  18  [74.125.83.54])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  19  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  20  646A3431FBC    for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 23:24:58 -0700\r
  21  (PDT)\r
  22 Received: by mail-ee0-f54.google.com with SMTP id d49so2911617eek.27\r
  23         for <notmuch@notmuchmail.org>; Sun, 09 Mar 2014 23:24:54 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  27         :references;\r
  28         bh=KAmHh6bYdUkNW/YM9wXxxHBbxWPUgF6rhlGdAhNa6/Q=;\r
  29         b=bSIINZUkJJj2ryWE/SlNSmVY4rGPuF5KPr5Sof2UtZ7G3P3IVWzau9/zOFtFq7CmW7\r
  30         WMoMv8EdSa0zXSnlQLcWvSlkLxxwyWLEaelx7xTtp93n8DkTr0hebc/jVJlboUoDLxL+\r
  31         QBZjNfgSIjDwA43gzzifdNXZ6FLv0rz0hsiqbNe1KiK8C2pCHebNpVrR03tfQakeeGsP\r
  32         lqmvJinafNz49wQWQ/M7PCLZVpmtrAA+4Lnr5Vq5uCadTZfZajD7RKqTj6ctb7S7GYcz\r
  33         UujhZEhuEd00+6YWlQqJ8KfVYPvlfzFXgwzliGK2dpEyDqUS1HdxghmvqrDJ/0GjKbRj\r
  34         vY0Q==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQm+v0QhORQbfQopTqGmh1EZYJUCXhts3j9Bdg16IQ/HKJUqyxLmhyotYMjrYJxmAUyf0PFz\r
  37 X-Received: by 10.15.56.130 with SMTP id y2mr33295555eew.17.1394432693155;\r
  38         Sun, 09 Mar 2014 23:24:53 -0700 (PDT)\r
  39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  40         [88.195.111.91])\r
  41         by mx.google.com with ESMTPSA id o5sm41217913eeg.8.2014.03.09.23.24.51\r
  42         for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Sun, 09 Mar 2014 23:24:52 -0700 (PDT)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: notmuch@notmuchmail.org\r
  47 Subject: [PATCH v5] test: add machinery to download and verify databases\r
  48 Date: Mon, 10 Mar 2014 08:24:50 +0200\r
  49 Message-Id: <1394432690-3208-1-git-send-email-jani@nikula.org>\r
  50 X-Mailer: git-send-email 1.9.0\r
  51 In-Reply-To:\r
  52  <aa1f5c1f9a06736c01065b01525625408cc2adbf.1394400503.git.jani@nikula.org>\r
  53 References:\r
  54  <aa1f5c1f9a06736c01065b01525625408cc2adbf.1394400503.git.jani@nikula.org>\r
  55 X-BeenThere: notmuch@notmuchmail.org\r
  56 X-Mailman-Version: 2.1.13\r
  57 Precedence: list\r
  58 List-Id: "Use and development of the notmuch mail system."\r
  59         <notmuch.notmuchmail.org>\r
  60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  63 List-Post: <mailto:notmuch@notmuchmail.org>\r
  64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  67 X-List-Received-Date: Mon, 10 Mar 2014 06:25:07 -0000\r
  68 \r
  69 From: David Bremner <david@tethera.net>\r
  70 \r
  71 Note that it is intentional that the checksum file is not\r
  72 downloaded. The intent is to check those into git.\r
  73 ---\r
  74  Makefile                           |  3 ++-\r
  75  test/README                        |  8 ++++++++\r
  76  test/T530-upgrade.sh               |  2 +-\r
  77  test/test-databases/Makefile       |  7 +++++++\r
  78  test/test-databases/Makefile.local | 14 ++++++++++++++\r
  79  5 files changed, 32 insertions(+), 2 deletions(-)\r
  80  create mode 100644 test/test-databases/Makefile\r
  81  create mode 100644 test/test-databases/Makefile.local\r
  82 \r
  83 diff --git a/Makefile b/Makefile\r
  84 index f53bec0ea401..061c55a1948a 100644\r
  85 --- a/Makefile\r
  86 +++ b/Makefile\r
  87 @@ -5,7 +5,8 @@ all:\r
  88  # List all subdirectories here. Each contains its own Makefile.local.\r
  89  # Use of '=', without '+=', seems to be required for out-of-tree\r
  90  # builds to work.\r
  91 -subdirs = compat completion doc emacs lib parse-time-string performance-test util test\r
  92 +subdirs = compat completion doc emacs lib parse-time-string    \\r
  93 +       performance-test util test test/test-databases\r
  94  \r
  95  # We make all targets depend on the Makefiles themselves.\r
  96  global_deps = Makefile Makefile.config Makefile.local \\r
  97 diff --git a/test/README b/test/README\r
  98 index 79a9b1b2f9a1..81a1c82dcdbd 100644\r
  99 --- a/test/README\r
 100 +++ b/test/README\r
 101 @@ -64,6 +64,14 @@ The following command-line options are available when running tests:\r
 102         Pointing this argument at a tmpfs filesystem can improve the\r
 103         speed of the test suite for some users.\r
 104  \r
 105 +Certain tests require precomputed databases to complete. You can fetch these\r
 106 +databases with\r
 107 +\r
 108 +       make download-test-databases\r
 109 +\r
 110 +If you do not download the test databases, the relevant tests will be\r
 111 +skipped.\r
 112 +\r
 113  When invoking the test suite via "make test" any of the above options\r
 114  can be specified as follows:\r
 115  \r
 116 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
 117 index 1d883986db83..6cbbb860998a 100755\r
 118 --- a/test/T530-upgrade.sh\r
 119 +++ b/test/T530-upgrade.sh\r
 120 @@ -7,7 +7,7 @@ dbtarball=folders-v1.tar.xz\r
 121  \r
 122  # XXX: Accomplish the same with test lib helpers\r
 123  if [ ! -e ${TEST_DIRECTORY}/test-databases/${dbtarball} ]; then\r
 124 -    test_subtest_missing_external_prereq_["${dbtarball}"]=t\r
 125 +    test_subtest_missing_external_prereq_["${dbtarball} - fetch with 'make download-test-databases'"]=t\r
 126  fi\r
 127  \r
 128  test_expect_success \\r
 129 diff --git a/test/test-databases/Makefile b/test/test-databases/Makefile\r
 130 new file mode 100644\r
 131 index 000000000000..b250a8bea31d\r
 132 --- /dev/null\r
 133 +++ b/test/test-databases/Makefile\r
 134 @@ -0,0 +1,7 @@\r
 135 +# See Makefile.local for the list of files to be compiled in this\r
 136 +# directory.\r
 137 +all:\r
 138 +       $(MAKE) -C ../.. all\r
 139 +\r
 140 +.DEFAULT:\r
 141 +       $(MAKE) -C ../.. $@\r
 142 diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local\r
 143 new file mode 100644\r
 144 index 000000000000..e777ada71667\r
 145 --- /dev/null\r
 146 +++ b/test/test-databases/Makefile.local\r
 147 @@ -0,0 +1,14 @@\r
 148 +# -*- makefile -*-\r
 149 +\r
 150 +TEST_DATABASE_MIRROR=http://notmuchmail.org/releases/test-databases\r
 151 +\r
 152 +dir := test/test-databases\r
 153 +\r
 154 +test_databases := $(dir)/folders-v1.tar.xz\r
 155 +\r
 156 +%.tar.xz:\r
 157 +       wget -nv -O $@ ${TEST_DATABASE_MIRROR}/$(notdir $@);\r
 158 +\r
 159 +download-test-databases: ${test_databases}\r
 160 +\r
 161 +DISTCLEAN := $(DISTCLEAN) ${test_databases}\r
 162 -- \r
 163 1.9.0\r
 164 \r