[Patch v2 10/11] perf-test: split basic into 00-new and 01-dump-restore

diff --git a/c4/831dd115b99afe1291dd3b883c8cc1dc001c6e b/c4/831dd115b99afe1291dd3b883c8cc1dc001c6e
new file mode 100644 (file)
index 0000000..9cfad3b
--- /dev/null
+++ b/c4/831dd115b99afe1291dd3b883c8cc1dc001c6e
@@ -0,0 +1,184 @@
+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 BA5A7431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  5 Dec 2012 19:02:14 -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 N0auSXSf6z0a for <notmuch@notmuchmail.org>;\r
+       Wed,  5 Dec 2012 19:02:13 -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 87247431FBC\r
+       for <notmuch@notmuchmail.org>; Wed,  5 Dec 2012 19:02:11 -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 1TgRiz-0002D4-Gj; Wed, 05 Dec 2012 23:02:09 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TgRiu-0001Z7-1g; Wed, 05 Dec 2012 23:02:04 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 10/11] perf-test: split basic into 00-new and\r
+       01-dump-restore\r
+Date: Wed,  5 Dec 2012 23:01:47 -0400\r
+Message-Id: <1354762908-5788-11-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354762908-5788-1-git-send-email-david@tethera.net>\r
+References: <1354762908-5788-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: Thu, 06 Dec 2012 03:02:15 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+We rely on subsequent "notmuch new" invocations being relatively fast\r
+rather than trying to detect if notmuch-new needs to be run.\r
+---\r
+ performance-test/00-new            |   21 +++++++++++++++++++++\r
+ performance-test/01-dump-restore   |   15 +++++++++++++++\r
+ performance-test/README            |    8 ++++++--\r
+ performance-test/basic             |   20 --------------------\r
+ performance-test/notmuch-perf-test |    3 ++-\r
+ 5 files changed, 44 insertions(+), 23 deletions(-)\r
+ create mode 100755 performance-test/00-new\r
+ create mode 100755 performance-test/01-dump-restore\r
+ delete mode 100755 performance-test/basic\r
+\r
+diff --git a/performance-test/00-new b/performance-test/00-new\r
+new file mode 100755\r
+index 0000000..02db874\r
+--- /dev/null\r
++++ b/performance-test/00-new\r
+@@ -0,0 +1,21 @@\r
++#!/bin/bash\r
++\r
++test_description='notmuch new'\r
++\r
++. ./perf-test-lib.sh\r
++\r
++uncache_database\r
++\r
++add_email_corpus\r
++\r
++print_header\r
++\r
++time_run 'initial notmuch new' 'notmuch new'\r
++\r
++cache_database\r
++\r
++for i in $(seq 2 6); do\r
++    time_run "notmuch new #$i" 'notmuch new'\r
++done\r
++\r
++time_done\r
+diff --git a/performance-test/01-dump-restore b/performance-test/01-dump-restore\r
+new file mode 100755\r
+index 0000000..09444e3\r
+--- /dev/null\r
++++ b/performance-test/01-dump-restore\r
+@@ -0,0 +1,15 @@\r
++#!/bin/bash\r
++\r
++test_description='Dump and restore'\r
++\r
++. ./perf-test-lib.sh\r
++\r
++add_email_corpus\r
++\r
++print_header\r
++\r
++time_run 'notmuch new' 'notmuch new'\r
++time_run 'dump *' 'notmuch dump > tags.out'\r
++time_run 'restore *' 'notmuch restore < tags.out'\r
++\r
++time_done\r
+diff --git a/performance-test/README b/performance-test/README\r
+index fd5c977..35489a9 100644\r
+--- a/performance-test/README\r
++++ b/performance-test/README\r
+@@ -51,8 +51,8 @@ Each test script supports the following arguments\r
+ Writing tests\r
+ -------------\r
+ \r
+-Have a look at "basic" for an example. Sourcing "perf-test-lib.sh" is\r
+-mandatory.  Utility functions include\r
++Have a look at "01-dump-restore" for an example. Sourcing\r
++"perf-test-lib.sh" is mandatory.  Utility functions include\r
+ \r
+ - 'add_email_corpus' unpacks a set of messages and adds them to the database.\r
+ - 'cache_database': makes a snapshot of the current database\r
+@@ -60,3 +60,7 @@ mandatory.  Utility functions include\r
+   database.\r
+ - 'time_done' does the cleanup; comment it out or pass --debug to the\r
+   script to leave the temporary files around.\r
++\r
++Scripts are run in the order specified in notmuch-perf-test. In the\r
++future this order might be chosen automatically so please follow the\r
++convention of starting the name with two digits to specify the order.\r
+diff --git a/performance-test/basic b/performance-test/basic\r
+deleted file mode 100755\r
+index 41a7ff1..0000000\r
+--- a/performance-test/basic\r
++++ /dev/null\r
+@@ -1,20 +0,0 @@\r
+-#!/bin/bash\r
+-\r
+-. ./perf-test-lib.sh\r
+-\r
+-uncache_database\r
+-\r
+-add_email_corpus\r
+-\r
+-print_header\r
+-\r
+-time_run 'initial notmuch new' 'notmuch new'\r
+-\r
+-cache_database\r
+-\r
+-time_run 'second notmuch new' 'notmuch new'\r
+-time_run 'dump *' 'notmuch dump > tags.out'\r
+-time_run 'restore *' 'notmuch restore < tags.out'\r
+-time_run 'tag * +new_tag' "notmuch tag +new_tag '*'"\r
+-\r
+-time_done\r
+diff --git a/performance-test/notmuch-perf-test b/performance-test/notmuch-perf-test\r
+index 1bea345..f93d8a4 100755\r
+--- a/performance-test/notmuch-perf-test\r
++++ b/performance-test/notmuch-perf-test\r
+@@ -17,7 +17,8 @@ fi\r
+ cd $(dirname "$0")\r
+ \r
+ TESTS="\r
+-  basic\r
++  00-new\r
++  01-dump-restore\r
+ "\r
+ \r
+ for test in $TESTS; do\r
+-- \r
+1.7.10.4\r
+\r