1 Return-Path: <bremner@tethera.net>
\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 882F3431FC7
\r
6 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 20:19:13 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 kPEqFJVLjm+z for <notmuch@notmuchmail.org>;
\r
16 Mon, 3 Dec 2012 20:19:12 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id ACCE0431FCB
\r
21 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 20:19:05 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1TfjyK-0008Dg-VO; Tue, 04 Dec 2012 00:19:05 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TfjyF-0001MX-HF; Tue, 04 Dec 2012 00:18:59 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 3/4] perf-test: unpack tags.
\r
34 Date: Tue, 4 Dec 2012 00:18:31 -0400
\r
35 Message-Id: <1354594712-5179-3-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
37 In-Reply-To: <1354594712-5179-1-git-send-email-david@tethera.net>
\r
38 References: <1354583824-10520-3-git-send-email-david@tethera.net>
\r
39 <1354594712-5179-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Tue, 04 Dec 2012 04:19:14 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 It's a bit annoying to call tar twice, but we cache the results so it
\r
59 isn't as bad as it could be.
\r
61 performance-test/Makefile.local | 1 +
\r
62 performance-test/perf-test-lib.sh | 25 +++++++++++++++++++------
\r
63 2 files changed, 20 insertions(+), 6 deletions(-)
\r
65 diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
\r
66 index b136a88..cdd7f19 100644
\r
67 --- a/performance-test/Makefile.local
\r
68 +++ b/performance-test/Makefile.local
\r
69 @@ -30,3 +30,4 @@ download-corpus:
\r
70 wget -O ${TXZFILE} ${DEFAULT_URL}
\r
72 CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus.mail.* $(dir)/notmuch.cache.*
\r
73 +CLEAN := $(CLEAN) $(dir)/corpus.tags
\r
74 diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
\r
75 index 08e2ebd..40c88c9 100644
\r
76 --- a/performance-test/perf-test-lib.sh
\r
77 +++ b/performance-test/perf-test-lib.sh
\r
78 @@ -41,6 +41,13 @@ DB_CACHE_DIR=${TEST_DIRECTORY}/notmuch.cache.$corpus_size
\r
83 + if command -v pixz > /dev/null; then
\r
89 if [ ! -d $CORPUS_DIR ]; then
\r
90 case "$corpus_size" in
\r
92 @@ -53,12 +60,6 @@ add_email_corpus ()
\r
96 - if command -v pixz > /dev/null; then
\r
102 printf "Unpacking corpus\n"
\r
105 @@ -72,6 +73,18 @@ add_email_corpus ()
\r
109 + if [ ! -d $TEST_DIRECTORY/corpus.tags ]; then
\r
111 + mkdir $TEST_DIRECTORY/corpus.tags
\r
113 + tar --extract --strip-components=2 \
\r
114 + --directory $TEST_DIRECTORY/corpus.tags \
\r
115 + --use-compress-program ${XZ} \
\r
116 + --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \
\r
117 + notmuch-email-corpus/tags
\r
120 + cp -lr $TEST_DIRECTORY/corpus.tags $TMP_DIRECTORY
\r
121 cp -lr $CORPUS_DIR $MAIL_DIR
\r
123 if [ -d $DB_CACHE_DIR ]; then
\r