[PATCH 3/4] perf-test: unpack tags.

diff --git a/12/070d65e3ff1b15640d17cbc20a52b4bf3b471c b/12/070d65e3ff1b15640d17cbc20a52b4bf3b471c
new file mode 100644 (file)
index 0000000..64ed737
--- /dev/null
+++ b/12/070d65e3ff1b15640d17cbc20a52b4bf3b471c
@@ -0,0 +1,126 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 882F3431FC7\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 20:19:13 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id kPEqFJVLjm+z for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Dec 2012 20:19:12 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id ACCE0431FCB\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 20:19:05 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TfjyK-0008Dg-VO; Tue, 04 Dec 2012 00:19:05 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TfjyF-0001MX-HF; Tue, 04 Dec 2012 00:18:59 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] perf-test: unpack tags.\r
+Date: Tue,  4 Dec 2012 00:18:31 -0400\r
+Message-Id: <1354594712-5179-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354594712-5179-1-git-send-email-david@tethera.net>\r
+References: <1354583824-10520-3-git-send-email-david@tethera.net>\r
+       <1354594712-5179-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 04 Dec 2012 04:19:14 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+It's a bit annoying to call tar twice, but we cache the results so it\r
+isn't as bad as it could be.\r
+---\r
+ performance-test/Makefile.local   |    1 +\r
+ performance-test/perf-test-lib.sh |   25 +++++++++++++++++++------\r
+ 2 files changed, 20 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local\r
+index b136a88..cdd7f19 100644\r
+--- a/performance-test/Makefile.local\r
++++ b/performance-test/Makefile.local\r
+@@ -30,3 +30,4 @@ download-corpus:\r
+       wget -O ${TXZFILE} ${DEFAULT_URL}\r
+ \r
+ CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus.mail.* $(dir)/notmuch.cache.*\r
++CLEAN := $(CLEAN) $(dir)/corpus.tags\r
+diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
+index 08e2ebd..40c88c9 100644\r
+--- a/performance-test/perf-test-lib.sh\r
++++ b/performance-test/perf-test-lib.sh\r
+@@ -41,6 +41,13 @@ DB_CACHE_DIR=${TEST_DIRECTORY}/notmuch.cache.$corpus_size\r
+ add_email_corpus ()\r
+ {\r
+     rm -rf ${MAIL_DIR}\r
++\r
++    if command -v pixz > /dev/null; then\r
++      XZ=pixz\r
++    else\r
++      XZ=xz\r
++    fi\r
++\r
+     if [ ! -d $CORPUS_DIR ]; then\r
+       case "$corpus_size" in\r
+           small)\r
+@@ -53,12 +60,6 @@ add_email_corpus ()\r
+               arg=mail\r
+       esac\r
+ \r
+-      if command -v pixz > /dev/null; then\r
+-          XZ=pixz\r
+-      else\r
+-          XZ=xz\r
+-      fi\r
+-\r
+       printf "Unpacking corpus\n"\r
+       mkdir $CORPUS_DIR\r
+ \r
+@@ -72,6 +73,18 @@ add_email_corpus ()\r
+ \r
+     fi\r
+ \r
++    if [ ! -d $TEST_DIRECTORY/corpus.tags ]; then\r
++\r
++      mkdir $TEST_DIRECTORY/corpus.tags\r
++\r
++      tar --extract --strip-components=2 \\r
++          --directory $TEST_DIRECTORY/corpus.tags \\r
++          --use-compress-program ${XZ} \\r
++          --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
++          notmuch-email-corpus/tags\r
++    fi\r
++\r
++    cp -lr $TEST_DIRECTORY/corpus.tags $TMP_DIRECTORY\r
+     cp -lr $CORPUS_DIR $MAIL_DIR\r
+ \r
+     if [ -d $DB_CACHE_DIR ]; then\r
+-- \r
+1.7.10.4\r
+\r