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 2CA40431FBF
\r
6 for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 04:45:34 -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 DfXxvK8EB5G3 for <notmuch@notmuchmail.org>;
\r
16 Sat, 15 Dec 2012 04:45:32 -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 86ABC421165
\r
21 for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 04:45:29 -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 1Tjr7Q-0006C4-LL; Sat, 15 Dec 2012 08:45:28 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Tjr7L-00008s-4T; Sat, 15 Dec 2012 08:45:23 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v3 10/11] perf-test: split basic into 00-new, 01-dump-restore,
\r
35 Date: Sat, 15 Dec 2012 08:45:13 -0400
\r
36 Message-Id: <1355575514-32735-11-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1355575514-32735-1-git-send-email-david@tethera.net>
\r
39 References: <1355575514-32735-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: Sat, 15 Dec 2012 12:45:34 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 We use the new "time_start" function to restore the database from cache
\r
61 performance-test/00-new | 19 +++++++++++++++++++
\r
62 performance-test/01-dump-restore | 12 ++++++++++++
\r
63 performance-test/02-tag | 14 ++++++++++++++
\r
64 performance-test/README | 8 ++++++--
\r
65 performance-test/basic | 20 --------------------
\r
66 performance-test/notmuch-perf-test | 4 +++-
\r
67 6 files changed, 54 insertions(+), 23 deletions(-)
\r
68 create mode 100755 performance-test/00-new
\r
69 create mode 100755 performance-test/01-dump-restore
\r
70 create mode 100755 performance-test/02-tag
\r
71 delete mode 100755 performance-test/basic
\r
73 diff --git a/performance-test/00-new b/performance-test/00-new
\r
74 new file mode 100755
\r
75 index 0000000..6f0b50c
\r
77 +++ b/performance-test/00-new
\r
81 +test_description='notmuch new'
\r
83 +. ./perf-test-lib.sh
\r
89 +time_run 'initial notmuch new' 'notmuch new'
\r
93 +for i in $(seq 2 6); do
\r
94 + time_run "notmuch new #$i" 'notmuch new'
\r
98 diff --git a/performance-test/01-dump-restore b/performance-test/01-dump-restore
\r
99 new file mode 100755
\r
100 index 0000000..0ee3a28
\r
102 +++ b/performance-test/01-dump-restore
\r
106 +test_description='dump and restore'
\r
108 +. ./perf-test-lib.sh
\r
112 +time_run 'dump *' 'notmuch dump > tags.out'
\r
113 +time_run 'restore *' 'notmuch restore < tags.out'
\r
116 diff --git a/performance-test/02-tag b/performance-test/02-tag
\r
117 new file mode 100755
\r
118 index 0000000..78ceccc
\r
120 +++ b/performance-test/02-tag
\r
124 +test_description='tagging'
\r
126 +. ./perf-test-lib.sh
\r
130 +time_run 'tag * +new_tag' "notmuch tag +new_tag '*'"
\r
131 +time_run 'tag * +existing_tag' "notmuch tag +new_tag '*'"
\r
132 +time_run 'tag * -existing_tag' "notmuch tag -new_tag '*'"
\r
133 +time_run 'tag * -missing_tag' "notmuch tag -new_tag '*'"
\r
136 diff --git a/performance-test/README b/performance-test/README
\r
137 index d36612d..1481660 100644
\r
138 --- a/performance-test/README
\r
139 +++ b/performance-test/README
\r
140 @@ -51,8 +51,8 @@ Each test script supports the following arguments
\r
144 -Have a look at "basic" for an example. Sourcing "perf-test-lib.sh" is
\r
145 -mandatory. Utility functions include
\r
146 +Have a look at "01-dump-restore" for an example. Sourcing
\r
147 +"perf-test-lib.sh" is mandatory. Utility functions include
\r
149 - 'add_email_corpus' unpacks a set of messages and adds them to the database.
\r
150 - 'cache_database': makes a snapshot of the current database
\r
151 @@ -62,3 +62,7 @@ mandatory. Utility functions include
\r
152 cannot find a cache of the appropriate corpus.
\r
153 - 'time_done' does the cleanup; comment it out or pass --debug to the
\r
154 script to leave the temporary files around.
\r
156 +Scripts are run in the order specified in notmuch-perf-test. In the
\r
157 +future this order might be chosen automatically so please follow the
\r
158 +convention of starting the name with two digits to specify the order.
\r
159 diff --git a/performance-test/basic b/performance-test/basic
\r
160 deleted file mode 100755
\r
161 index 41a7ff1..0000000
\r
162 --- a/performance-test/basic
\r
167 -. ./perf-test-lib.sh
\r
175 -time_run 'initial notmuch new' 'notmuch new'
\r
179 -time_run 'second notmuch new' 'notmuch new'
\r
180 -time_run 'dump *' 'notmuch dump > tags.out'
\r
181 -time_run 'restore *' 'notmuch restore < tags.out'
\r
182 -time_run 'tag * +new_tag' "notmuch tag +new_tag '*'"
\r
185 diff --git a/performance-test/notmuch-perf-test b/performance-test/notmuch-perf-test
\r
186 index 1bea345..fc39d8a 100755
\r
187 --- a/performance-test/notmuch-perf-test
\r
188 +++ b/performance-test/notmuch-perf-test
\r
189 @@ -17,7 +17,9 @@ fi
\r
199 for test in $TESTS; do
\r