From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [Patch v3 10/11] perf-test: split basic into 00-new, 01-dump-restore, and 02-tag
Date: Sat, 15 Dec 2012 08:45:13 -0400 [thread overview]
Message-ID: <1355575514-32735-11-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1355575514-32735-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@debian.org>
We use the new "time_start" function to restore the database from cache
if possible.
---
performance-test/00-new | 19 +++++++++++++++++++
performance-test/01-dump-restore | 12 ++++++++++++
performance-test/02-tag | 14 ++++++++++++++
performance-test/README | 8 ++++++--
performance-test/basic | 20 --------------------
performance-test/notmuch-perf-test | 4 +++-
6 files changed, 54 insertions(+), 23 deletions(-)
create mode 100755 performance-test/00-new
create mode 100755 performance-test/01-dump-restore
create mode 100755 performance-test/02-tag
delete mode 100755 performance-test/basic
diff --git a/performance-test/00-new b/performance-test/00-new
new file mode 100755
index 0000000..6f0b50c
--- /dev/null
+++ b/performance-test/00-new
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+test_description='notmuch new'
+
+. ./perf-test-lib.sh
+
+uncache_database
+
+time_start
+
+time_run 'initial notmuch new' 'notmuch new'
+
+cache_database
+
+for i in $(seq 2 6); do
+ time_run "notmuch new #$i" 'notmuch new'
+done
+
+time_done
diff --git a/performance-test/01-dump-restore b/performance-test/01-dump-restore
new file mode 100755
index 0000000..0ee3a28
--- /dev/null
+++ b/performance-test/01-dump-restore
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+test_description='dump and restore'
+
+. ./perf-test-lib.sh
+
+time_start
+
+time_run 'dump *' 'notmuch dump > tags.out'
+time_run 'restore *' 'notmuch restore < tags.out'
+
+time_done
diff --git a/performance-test/02-tag b/performance-test/02-tag
new file mode 100755
index 0000000..78ceccc
--- /dev/null
+++ b/performance-test/02-tag
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+test_description='tagging'
+
+. ./perf-test-lib.sh
+
+time_start
+
+time_run 'tag * +new_tag' "notmuch tag +new_tag '*'"
+time_run 'tag * +existing_tag' "notmuch tag +new_tag '*'"
+time_run 'tag * -existing_tag' "notmuch tag -new_tag '*'"
+time_run 'tag * -missing_tag' "notmuch tag -new_tag '*'"
+
+time_done
diff --git a/performance-test/README b/performance-test/README
index d36612d..1481660 100644
--- a/performance-test/README
+++ b/performance-test/README
@@ -51,8 +51,8 @@ Each test script supports the following arguments
Writing tests
-------------
-Have a look at "basic" for an example. Sourcing "perf-test-lib.sh" is
-mandatory. Utility functions include
+Have a look at "01-dump-restore" for an example. Sourcing
+"perf-test-lib.sh" is mandatory. Utility functions include
- 'add_email_corpus' unpacks a set of messages and adds them to the database.
- 'cache_database': makes a snapshot of the current database
@@ -62,3 +62,7 @@ mandatory. Utility functions include
cannot find a cache of the appropriate corpus.
- 'time_done' does the cleanup; comment it out or pass --debug to the
script to leave the temporary files around.
+
+Scripts are run in the order specified in notmuch-perf-test. In the
+future this order might be chosen automatically so please follow the
+convention of starting the name with two digits to specify the order.
diff --git a/performance-test/basic b/performance-test/basic
deleted file mode 100755
index 41a7ff1..0000000
--- a/performance-test/basic
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-. ./perf-test-lib.sh
-
-uncache_database
-
-add_email_corpus
-
-print_header
-
-time_run 'initial notmuch new' 'notmuch new'
-
-cache_database
-
-time_run 'second notmuch new' 'notmuch new'
-time_run 'dump *' 'notmuch dump > tags.out'
-time_run 'restore *' 'notmuch restore < tags.out'
-time_run 'tag * +new_tag' "notmuch tag +new_tag '*'"
-
-time_done
diff --git a/performance-test/notmuch-perf-test b/performance-test/notmuch-perf-test
index 1bea345..fc39d8a 100755
--- a/performance-test/notmuch-perf-test
+++ b/performance-test/notmuch-perf-test
@@ -17,7 +17,9 @@ fi
cd $(dirname "$0")
TESTS="
- basic
+ 00-new
+ 01-dump-restore
+ 02-tag
"
for test in $TESTS; do
--
1.7.10.4
next prev parent reply other threads:[~2012-12-15 12:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-15 12:45 v3 performance tests improvements david
2012-12-15 12:45 ` [Patch v3 01/11] perf-test: propagate non-zero returns from /usr/bin/time david
2012-12-15 12:45 ` [Patch v3 02/11] perf-test: add argument parsing for performance tests david
2012-12-15 12:45 ` [Patch v3 03/11] perf-test: add corpus size to output, compact I/O stats david
2012-12-15 12:45 ` [Patch v3 04/11] perf-test: optionally print description for each group of tests david
2012-12-15 12:45 ` [Patch v3 05/11] perf-test: cache unpacked corpus david
2012-12-15 12:45 ` [Patch v3 06/11] perf-test: add caching of xapian database david
2012-12-15 12:45 ` [Patch v3 07/11] perf-test: update README david
2012-12-15 12:45 ` [Patch v3 08/11] perf-test: bump corpus version to 0.3 david
2012-12-15 12:45 ` [Patch v3 09/11] perf-test: unpack tags david
2012-12-15 12:45 ` david [this message]
2012-12-15 12:45 ` [Patch v3 11/11] perf-test: use nmbug tags in dump-restore tests david
2012-12-15 16:45 ` v3 performance tests improvements Tomi Ollila
2012-12-15 18:33 ` David Bremner
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=1355575514-32735-11-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).