From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id DF191429E21 for ; Fri, 25 Nov 2011 17:45:01 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 9DWYagYyDM4Y for ; Fri, 25 Nov 2011 17:45:01 -0800 (PST) Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 0AFF8431FB6 for ; Fri, 25 Nov 2011 17:45:00 -0800 (PST) Received: by bkaq10 with SMTP id q10so5540957bka.26 for ; Fri, 25 Nov 2011 17:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer; bh=fO8Z3i9jnbHvHPgiOPM2ghNqPRVbPqkJpdPMeh5GZ2g=; b=oHhRUAbiB/J2KMQQgjAOO5q90yBj0n9g0qxSbtcUZiGx5GgQdpzCbMbV14DDJealKo 4otsIEhRAS0dBHGkCs0vXaw66/hRJwAPXQgFl3LJNgTmoOjN0sAZsVIQr7L7Ps33VPAP s4eMiVaWLBWoF37L23XXsk/PxcC6a0TAeEEIM= Received: by 10.204.13.78 with SMTP id b14mr22179064bka.23.1322271898095; Fri, 25 Nov 2011 17:44:58 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id q6sm20398601bka.6.2011.11.25.17.44.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Nov 2011 17:44:57 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH 1/3] test: add functions to count how much times notmuch was called Date: Sat, 26 Nov 2011 05:44:36 +0400 Message-Id: <1322271878-32614-1-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.7.3 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: Sat, 26 Nov 2011 01:45:02 -0000 The patch adds two auxiliary functions and a variable: notmuch_counter_reset $notmuch_counter notmuch_counter They allow to count how many times notmuch binary is called. notmuch_counter_reset() function generates a script that counts how many times it is called and resets the counter to zero. The function sets $notmuch_counter variable to the path to the generated script that should be called instead of notmuch to do the counting. The notmuch_counter() function returns the current counter value. --- test/README | 16 ++++++++++++++-- test/test-lib.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/test/README b/test/README index 2481f16..1570f7c 100644 --- a/test/README +++ b/test/README @@ -187,8 +187,8 @@ library for your script to use. is to summarize successes and failures in the test script and exit with an appropriate error code. -There are also a number of mail-specific functions which are useful in -writing tests: +There are also a number of notmuch-specific auxiliary functions and +variables which are useful in writing tests: generate_message @@ -212,3 +212,15 @@ writing tests: will initialize the mail database to a known state of 50 sample messages, (culled from the early history of the notmuch mailing list). + + notmuch_counter_reset + $notmuch_counter + notmuch_counter + + These allow to count how many times notmuch binary is called. + notmuch_counter_reset() function generates a script that counts + how many times it is called and resets the counter to zero. The + function sets $notmuch_counter variable to the path to the + generated script that should be called instead of notmuch to do + the counting. The notmuch_counter() function returns the current + counter value. diff --git a/test/test-lib.sh b/test/test-lib.sh index 93867b0..e3b85d0 100755 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -864,6 +864,38 @@ test_emacs () { emacsclient --socket-name="$EMACS_SERVER" --eval "(progn $@)" } +# Creates a script that counts how much time it is executed and calls +# notmuch. $notmuch_counter is set to the path to the generated +# script. Use notmuch_counter() function to get the current counter +# value. +notmuch_counter_reset () { + notmuch_counter="$TMP_DIRECTORY/notmuch_counter" + if [ ! -x "$notmuch_counter" ]; then + notmuch_counter_state_path="$TMP_DIRECTORY/notmuch_counter.state" + cat <"$notmuch_counter" +#!/bin/sh + +count=\$(cat "$notmuch_counter_state_path") +echo -n \$(expr \$count + 1) > "$notmuch_counter_state_path" + +exec notmuch "\$@" +EOF + chmod +x "$notmuch_counter" || return + fi + + echo -n 0 > "$notmuch_counter_state_path" || return +} + +# Returns the current notmuch counter value. +notmuch_counter () { + if [ -r "$notmuch_counter_state_path" ]; then + count=$(cat "$notmuch_counter_state_path") + else + count=0 + fi + echo -n $count +} + find_notmuch_path () { -- 1.7.7.3