From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH 3/4] perf-test: unpack tags.
Date: Tue, 4 Dec 2012 00:18:31 -0400 [thread overview]
Message-ID: <1354594712-5179-3-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1354594712-5179-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@debian.org>
It's a bit annoying to call tar twice, but we cache the results so it
isn't as bad as it could be.
---
performance-test/Makefile.local | 1 +
performance-test/perf-test-lib.sh | 25 +++++++++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index b136a88..cdd7f19 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -30,3 +30,4 @@ download-corpus:
wget -O ${TXZFILE} ${DEFAULT_URL}
CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus.mail.* $(dir)/notmuch.cache.*
+CLEAN := $(CLEAN) $(dir)/corpus.tags
diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index 08e2ebd..40c88c9 100644
--- a/performance-test/perf-test-lib.sh
+++ b/performance-test/perf-test-lib.sh
@@ -41,6 +41,13 @@ DB_CACHE_DIR=${TEST_DIRECTORY}/notmuch.cache.$corpus_size
add_email_corpus ()
{
rm -rf ${MAIL_DIR}
+
+ if command -v pixz > /dev/null; then
+ XZ=pixz
+ else
+ XZ=xz
+ fi
+
if [ ! -d $CORPUS_DIR ]; then
case "$corpus_size" in
small)
@@ -53,12 +60,6 @@ add_email_corpus ()
arg=mail
esac
- if command -v pixz > /dev/null; then
- XZ=pixz
- else
- XZ=xz
- fi
-
printf "Unpacking corpus\n"
mkdir $CORPUS_DIR
@@ -72,6 +73,18 @@ add_email_corpus ()
fi
+ if [ ! -d $TEST_DIRECTORY/corpus.tags ]; then
+
+ mkdir $TEST_DIRECTORY/corpus.tags
+
+ tar --extract --strip-components=2 \
+ --directory $TEST_DIRECTORY/corpus.tags \
+ --use-compress-program ${XZ} \
+ --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \
+ notmuch-email-corpus/tags
+ fi
+
+ cp -lr $TEST_DIRECTORY/corpus.tags $TMP_DIRECTORY
cp -lr $CORPUS_DIR $MAIL_DIR
if [ -d $DB_CACHE_DIR ]; then
--
1.7.10.4
next prev parent reply other threads:[~2012-12-04 4:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 1:17 [PATCH 1/3] performance-test: add argument parsing for performance tests david
2012-12-04 1:17 ` [PATCH 2/3] perf-test: cache unpacked corpus david
2012-12-05 4:55 ` Austin Clements
2012-12-04 1:17 ` [PATCH 3/3] perf-test: add caching of xapian database david
2012-12-04 4:18 ` [PATCH 1/4] perf-test: add corpus size to output, compact I/O stats david
2012-12-04 4:18 ` [PATCH 2/4] perf-test: bump corpus version to 0.3 david
2012-12-04 4:34 ` David Bremner
2012-12-04 4:18 ` david [this message]
2012-12-05 5:23 ` [PATCH 3/4] perf-test: unpack tags Austin Clements
2012-12-05 12:23 ` David Bremner
2012-12-04 4:18 ` [PATCH 4/4] perf-test: add nmbug tags to default database david
2012-12-05 5:02 ` [PATCH 3/3] perf-test: add caching of xapian database Austin Clements
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354594712-5179-3-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=bremner@debian.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).