1 Return-Path: <amdragon@mit.edu>
\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 E91BB431FAE
\r
6 for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:28:48 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 dsSTlM1aWbI2 for <notmuch@notmuchmail.org>;
\r
16 Mon, 25 Aug 2014 10:28:44 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 692D9431FBC
\r
22 for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:28:17 -0700 (PDT)
\r
23 X-AuditID: 12074423-f799d6d00000337c-42-53fb7230f575
\r
24 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
25 (using TLS with cipher AES256-SHA (256/256 bits))
\r
26 (Client did not present a certificate)
\r
27 by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP
\r
28 id 4B.C0.13180.0327BF35; Mon, 25 Aug 2014 13:28:16 -0400 (EDT)
\r
29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
30 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s7PHQENf001077;
\r
31 Mon, 25 Aug 2014 13:26:15 -0400
\r
32 Received: from drake.dyndns.org (31-35-14.wireless.csail.mit.edu
\r
33 [128.31.35.14]) (authenticated bits=0)
\r
34 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
35 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s7PHQCJQ029609
\r
36 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
37 Mon, 25 Aug 2014 13:26:13 -0400
\r
38 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
39 (envelope-from <amdragon@mit.edu>)
\r
40 id 1XLy1z-0003jP-U8; Mon, 25 Aug 2014 13:26:11 -0400
\r
41 From: Austin Clements <amdragon@mit.edu>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v4 03/11] test: Tool to build DB with specific version and
\r
45 Date: Mon, 25 Aug 2014 13:26:01 -0400
\r
46 Message-Id: <1408987569-14146-4-git-send-email-amdragon@mit.edu>
\r
47 X-Mailer: git-send-email 2.0.0
\r
48 In-Reply-To: <1408987569-14146-1-git-send-email-amdragon@mit.edu>
\r
49 References: <1408987569-14146-1-git-send-email-amdragon@mit.edu>
\r
50 X-Brightmail-Tracker:
\r
51 H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nrmtQ9DvY4O8MS4sbrd2MFk3TnS2u
\r
52 35zJ7MDscev+a3aPZ6tuMXtsOfSeOYA5issmJTUnsyy1SN8ugSujb+Ud5oKpQhXHdu9gbmC8
\r
53 wtfFyMkhIWAi8eLtchYIW0ziwr31bF2MXBxCArOZJCbO64NyNjJKrF3YzQrhHGOSOHd4DlRm
\r
54 LqPEh7ZPzCD9bAIaEr9vLWYCsUUEpCV23p3NCmIzC3hJLLvQD2YLCwRLbOxbxQ5iswioSvRN
\r
55 XARm8wo4SCw50gt1h5xEw41PbCA2p4CjxPSFs8FmCgHVfL98nnkCI/8CRoZVjLIpuVW6uYmZ
\r
56 OcWpybrFyYl5ealFumZ6uZkleqkppZsYweHloryD8c9BpUOMAhyMSjy8N+J/BwuxJpYVV+Ye
\r
57 YpTkYFIS5Z2WDxTiS8pPqcxILM6ILyrNSS0+xCjBwawkwtsMkuNNSaysSi3Kh0lJc7AoifO+
\r
58 tbYKFhJITyxJzU5NLUgtgsnKcHAoSfDmFgA1ChalpqdWpGXmlCCkmTg4QYbzAA2PB6nhLS5I
\r
59 zC3OTIfIn2JUlBLnXQuyVQAkkVGaB9cLi/9XjOJArwjzHgVp5wGmDrjuV0CDmYAGm/b8BBlc
\r
60 koiQkmpgVL71Xr580uKoifuWX7K4o+98a/Kpw7eaGj/Z+UmGsx59vMj9HNuz/401jTN/bP80
\r
61 JdW05aDPU3ahX/vmRpY0VtSnzj4p3xu8a3nMj/TI/WrSC789VJzCOS184d2j92qDH+0+s6Es
\r
62 3PLAYo37cybHiUzsOvKGnVvtaNP99CXNb7+L/lniwxekmKrEUpyRaKjFXFScCAANnDXA2gIA AA==
\r
63 X-BeenThere: notmuch@notmuchmail.org
\r
64 X-Mailman-Version: 2.1.13
\r
66 List-Id: "Use and development of the notmuch mail system."
\r
67 <notmuch.notmuchmail.org>
\r
68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
71 List-Post: <mailto:notmuch@notmuchmail.org>
\r
72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
74 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
75 X-List-Received-Date: Mon, 25 Aug 2014 17:28:49 -0000
\r
77 This will let us test basic version and feature handling.
\r
79 test/.gitignore | 1 +
\r
80 test/Makefile.local | 4 ++++
\r
81 test/make-db-version.cc | 35 +++++++++++++++++++++++++++++++++++
\r
82 3 files changed, 40 insertions(+)
\r
83 create mode 100644 test/make-db-version.cc
\r
85 diff --git a/test/.gitignore b/test/.gitignore
\r
86 index b3b706d..0f7d5bf 100644
\r
87 --- a/test/.gitignore
\r
88 +++ b/test/.gitignore
\r
89 @@ -5,5 +5,6 @@ parse-time
\r
96 diff --git a/test/Makefile.local b/test/Makefile.local
\r
97 index 916dd0b..a2d58fc 100644
\r
98 --- a/test/Makefile.local
\r
99 +++ b/test/Makefile.local
\r
100 @@ -35,6 +35,9 @@ $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)
\r
101 $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
\r
102 $(call quiet,CC) $^ -o $@
\r
104 +$(dir)/make-db-version: $(dir)/make-db-version.o
\r
105 + $(call quiet,CXX) $^ -o $@ $(XAPIAN_LDFLAGS)
\r
109 test_main_srcs=$(dir)/arg-test.c \
\r
110 @@ -43,6 +46,7 @@ test_main_srcs=$(dir)/arg-test.c \
\r
111 $(dir)/parse-time.c \
\r
112 $(dir)/smtp-dummy.c \
\r
113 $(dir)/symbol-test.cc \
\r
114 + $(dir)/make-db-version.cc \
\r
116 test_srcs=$(test_main_srcs) $(dir)/database-test.c
\r
118 diff --git a/test/make-db-version.cc b/test/make-db-version.cc
\r
119 new file mode 100644
\r
120 index 0000000..fa80cac
\r
122 +++ b/test/make-db-version.cc
\r
124 +/* Create an empty notmuch database with a specific version and
\r
127 +#include <stdio.h>
\r
128 +#include <stdlib.h>
\r
129 +#include <sys/stat.h>
\r
130 +#include <sys/types.h>
\r
132 +#include <xapian.h>
\r
134 +int main(int argc, char **argv)
\r
137 + fprintf (stderr, "Usage: %s mailpath version features\n", argv[0]);
\r
141 + std::string nmpath (argv[1]);
\r
142 + nmpath += "/.notmuch";
\r
143 + if (mkdir (nmpath.c_str (), 0777) < 0) {
\r
144 + perror (("failed to create " + nmpath).c_str ());
\r
149 + Xapian::WritableDatabase db (
\r
150 + nmpath + "/xapian", Xapian::DB_CREATE_OR_OPEN);
\r
151 + db.set_metadata ("version", argv[2]);
\r
152 + db.set_metadata ("features", argv[3]);
\r
154 + } catch (const Xapian::Error &e) {
\r
155 + fprintf (stderr, "%s\n", e.get_description ().c_str ());
\r