From d17fcc78dd5d7189d3d7df59102f895efe2a3a8f Mon Sep 17 00:00:00 2001 From: david Date: Thu, 6 Dec 2012 23:01:41 +2000 Subject: [PATCH] [Patch v2 04/11] perf-test: optionally print description for each group of tests --- 80/967aef0ff724b93a0e349f5d96dbef9594ad3f | 94 +++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 80/967aef0ff724b93a0e349f5d96dbef9594ad3f diff --git a/80/967aef0ff724b93a0e349f5d96dbef9594ad3f b/80/967aef0ff724b93a0e349f5d96dbef9594ad3f new file mode 100644 index 000000000..b3492e99d --- /dev/null +++ b/80/967aef0ff724b93a0e349f5d96dbef9594ad3f @@ -0,0 +1,94 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5C867429E28 + for ; Wed, 5 Dec 2012 19:02:16 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id hW7OZQWf8Rtd for ; + Wed, 5 Dec 2012 19:02:14 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A9C11431FC0 + for ; Wed, 5 Dec 2012 19:02:11 -0800 (PST) +Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net + ([142.167.90.129] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1TgRiy-0002Cy-LJ; Wed, 05 Dec 2012 23:02:08 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TgRit-0001Ya-5p; Wed, 05 Dec 2012 23:02:03 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 04/11] perf-test: optionally print description for each + group of tests +Date: Wed, 5 Dec 2012 23:01:41 -0400 +Message-Id: <1354762908-5788-5-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1354762908-5788-1-git-send-email-david@tethera.net> +References: <1354762908-5788-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 06 Dec 2012 03:02:16 -0000 + +From: David Bremner + +Output from tests is indented slightly in the same style as the +correctness tests. +--- + performance-test/perf-test-lib.sh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh +index e399d3f..415bf15 100644 +--- a/performance-test/perf-test-lib.sh ++++ b/performance-test/perf-test-lib.sh +@@ -67,12 +67,12 @@ add_email_corpus () + } + + print_header () { +- printf "[v%4s %6s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n" \ ++ printf "[v%4s %6s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n" \ + ${PERFTEST_VERSION} ${corpus_size} + } + + time_run () { +- printf "%-22s" "$1" ++ printf " %-22s" "$1" + if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi + if ! eval >&3 "/usr/bin/time -f '%e\t%U\t%S\t%M\t%I/%O' $2" ; then + test_failure=$(($test_failure + 1)) +@@ -92,3 +92,8 @@ time_done () { + + cd -P "$test" || error "Cannot setup test environment" + test_failure=0 ++ ++if [[ -n "test_description" ]]; then ++ echo ++ echo $(basename "$0"): "Benchmarking ${test_description}" ++fi +-- +1.7.10.4 + -- 2.26.2