f1/c359e0c42fc4bb42f595b496db071fb5160ecf

   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 9D02A429E29\r
   6         for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:35 -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: -2.3\r
  10 X-Spam-Level: \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 ntc7rUpMUqrz for <notmuch@notmuchmail.org>;\r
  16         Thu, 31 Jul 2014 19:10:29 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
  18         [18.9.25.14])\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 94F13431FC3\r
  22         for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:13 -0700 (PDT)\r
  23 X-AuditID: 1209190e-f79946d000007db1-3a-53daf7036d8d\r
  24 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\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-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 43.DF.32177.307FAD35; Thu, 31 Jul 2014 22:10:11 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s712AA4e008864; \r
  31         Thu, 31 Jul 2014 22:10:11 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s712A6Hj029979\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Thu, 31 Jul 2014 22:10:10 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1XD2IH-00033f-W6; Thu, 31 Jul 2014 22:10:05 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH v3 05/13] test: Tool to build DB with specific version and\r
  45         features\r
  46 Date: Thu, 31 Jul 2014 22:09:55 -0400\r
  47 Message-Id: <1406859003-11561-6-git-send-email-amdragon@mit.edu>\r
  48 X-Mailer: git-send-email 2.0.0\r
  49 In-Reply-To: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
  50 References: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
  51 X-Brightmail-Tracker:\r
  52  H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrcv8/VawwYV3shar5/JYXL85k9mB\r
  53         yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyuhbeYe5YKpQxbHdO5gbGK/wdTFyckgImEj8\r
  54         /32IFcIWk7hwbz1bFyMXh5DAbCaJr5++s0A4Gxklbh26zATh3GGSWP/nAjOEM5dR4s6Bc0wg\r
  55         /WwCGhLb9i9nBLFFBKQldt6dDTaXWcBR4vP+RWwgtrBAsMS7hhnMIDaLgKrEuUPvwWp4BRwk\r
  56         3t95yQJxh5xEw41PYPWcQL3//y0AqxECqmk9vZV5AiP/AkaGVYyyKblVurmJmTnFqcm6xcmJ\r
  57         eXmpRbrGermZJXqpKaWbGMGhJMm3g/HrQaVDjAIcjEo8vDPCbwULsSaWFVfmHmKU5GBSEuW1\r
  58         +QgU4kvKT6nMSCzOiC8qzUktPsQowcGsJML78gNQjjclsbIqtSgfJiXNwaIkzvvW2ipYSCA9\r
  59         sSQ1OzW1ILUIJivDwaEkwXvmK1CjYFFqempFWmZOCUKaiYMTZDgP0HChbyDDiwsSc4sz0yHy\r
  60         pxgVpcR594A0C4AkMkrz4Hphsf6KURzoFWHehyBVPMA0Adf9CmgwE9Dg57eugwwuSURISTUw\r
  61         1rWor1Ct8855wrlzFteLIxVaGfqipwTELH9EGNuvWzDfJaBoEYf3o8oZmmxFKyU5PRtd58hv\r
  62         m6/y8IV3lPWdqjV7l/dn/MgMi7H45pYkHbnf299a49cx00eOR+fFin9cJWzCvsGVeSGj1ZHT\r
  63         LNNylyQFi7+9/9E7+M/ZRYpf0sIdmI0v/61UYinOSDTUYi4qTgQAV4B4vNACAAA=\r
  64 X-BeenThere: notmuch@notmuchmail.org\r
  65 X-Mailman-Version: 2.1.13\r
  66 Precedence: list\r
  67 List-Id: "Use and development of the notmuch mail system."\r
  68         <notmuch.notmuchmail.org>\r
  69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  72 List-Post: <mailto:notmuch@notmuchmail.org>\r
  73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  75         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  76 X-List-Received-Date: Fri, 01 Aug 2014 02:10:36 -0000\r
  77 \r
  78 This will let us test basic version and feature handling.\r
  79 ---\r
  80  test/.gitignore         |  1 +\r
  81  test/Makefile.local     |  4 ++++\r
  82  test/make-db-version.cc | 35 +++++++++++++++++++++++++++++++++++\r
  83  3 files changed, 40 insertions(+)\r
  84  create mode 100644 test/make-db-version.cc\r
  85 \r
  86 diff --git a/test/.gitignore b/test/.gitignore\r
  87 index b3b706d..0f7d5bf 100644\r
  88 --- a/test/.gitignore\r
  89 +++ b/test/.gitignore\r
  90 @@ -5,5 +5,6 @@ parse-time\r
  91  random-corpus\r
  92  smtp-dummy\r
  93  symbol-test\r
  94 +make-db-version\r
  95  test-results\r
  96  tmp.*\r
  97 diff --git a/test/Makefile.local b/test/Makefile.local\r
  98 index 916dd0b..a2d58fc 100644\r
  99 --- a/test/Makefile.local\r
 100 +++ b/test/Makefile.local\r
 101 @@ -35,6 +35,9 @@ $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)\r
 102  $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
 103         $(call quiet,CC) $^ -o $@\r
 104  \r
 105 +$(dir)/make-db-version: $(dir)/make-db-version.o\r
 106 +       $(call quiet,CXX) $^ -o $@ $(XAPIAN_LDFLAGS)\r
 107 +\r
 108  .PHONY: test check\r
 109  \r
 110  test_main_srcs=$(dir)/arg-test.c \\r
 111 @@ -43,6 +46,7 @@ test_main_srcs=$(dir)/arg-test.c \\r
 112               $(dir)/parse-time.c \\r
 113               $(dir)/smtp-dummy.c \\r
 114               $(dir)/symbol-test.cc \\r
 115 +             $(dir)/make-db-version.cc \\r
 116  \r
 117  test_srcs=$(test_main_srcs) $(dir)/database-test.c\r
 118  \r
 119 diff --git a/test/make-db-version.cc b/test/make-db-version.cc\r
 120 new file mode 100644\r
 121 index 0000000..fa80cac\r
 122 --- /dev/null\r
 123 +++ b/test/make-db-version.cc\r
 124 @@ -0,0 +1,35 @@\r
 125 +/* Create an empty notmuch database with a specific version and\r
 126 + * features. */\r
 127 +\r
 128 +#include <stdio.h>\r
 129 +#include <stdlib.h>\r
 130 +#include <sys/stat.h>\r
 131 +#include <sys/types.h>\r
 132 +\r
 133 +#include <xapian.h>\r
 134 +\r
 135 +int main(int argc, char **argv)\r
 136 +{\r
 137 +    if (argc != 4) {\r
 138 +       fprintf (stderr, "Usage: %s mailpath version features\n", argv[0]);\r
 139 +       exit (2);\r
 140 +    }\r
 141 +\r
 142 +    std::string nmpath (argv[1]);\r
 143 +    nmpath += "/.notmuch";\r
 144 +    if (mkdir (nmpath.c_str (), 0777) < 0) {\r
 145 +       perror (("failed to create " + nmpath).c_str ());\r
 146 +       exit (1);\r
 147 +    }\r
 148 +\r
 149 +    try {\r
 150 +       Xapian::WritableDatabase db (\r
 151 +           nmpath + "/xapian", Xapian::DB_CREATE_OR_OPEN);\r
 152 +       db.set_metadata ("version", argv[2]);\r
 153 +       db.set_metadata ("features", argv[3]);\r
 154 +       db.commit ();\r
 155 +    } catch (const Xapian::Error &e) {\r
 156 +       fprintf (stderr, "%s\n", e.get_description ().c_str ());\r
 157 +       exit (1);\r
 158 +    }\r
 159 +}\r
 160 -- \r
 161 2.0.0\r
 162 \r