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 CD7DE431FB6 for ; Mon, 28 Nov 2011 13:14:29 -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 GMPB1y-38Fqs for ; Mon, 28 Nov 2011 13:14:29 -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 0194D429E21 for ; Mon, 28 Nov 2011 13:14:28 -0800 (PST) Received: by bkaq10 with SMTP id q10so9880166bka.26 for ; Mon, 28 Nov 2011 13:14:27 -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:in-reply-to:references; bh=mAXHheg7kI+tfB+p8IKjX+N4w1cFZVq9rPh/P62KTSo=; b=UaFwSj2rkmz+Gd6qQ5Luv78oi30tYiIU05yOGnHGnGN0QRr/gwD7TcN8JKjp/yfh0p JgDmGkuDE5ttS1ec8mEWDry2aLAB40iY1LcxM9rsUbbW6M60ypQ75+cQPRvHNWQ+zSxM 4Y001N2CjWXN/0agEhj0awHl9Rr8mk4kIQ4nI= Received: by 10.204.151.144 with SMTP id c16mr13788276bkw.45.1322514867655; Mon, 28 Nov 2011 13:14:27 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id z7sm32345982bka.1.2011.11.28.13.14.26 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Nov 2011 13:14:26 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH v3 1/3] test: add functions to count how much times notmuch was called Date: Tue, 29 Nov 2011 01:13:57 +0400 Message-Id: <1322514839-28441-2-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1322514839-28441-1-git-send-email-dmitry.kurochkin@gmail.com> References: <1322271878-32614-1-git-send-email-dmitry.kurochkin@gmail.com> <1322514839-28441-1-git-send-email-dmitry.kurochkin@gmail.com> 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: Mon, 28 Nov 2011 21:14:29 -0000 The patch adds two auxiliary functions and a variable: notmuch_counter_reset $notmuch_counter_command notmuch_counter_value 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_command variable to the path to the generated script that should be called instead of notmuch to do the counting. The notmuch_counter_value() 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..5dc0638 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_command + notmuch_counter_value + + 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_command variable to the path to the + generated script that should be called instead of notmuch to do + the counting. The notmuch_counter_value() function prints the + current counter value. diff --git a/test/test-lib.sh b/test/test-lib.sh index 11e6646..7798e21 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -919,6 +919,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_command is set to the path to the +# generated script. Use notmuch_counter_value() function to get the +# current counter value. +notmuch_counter_reset () { + notmuch_counter_command="$TMP_DIRECTORY/notmuch_counter" + if [ ! -x "$notmuch_counter_command" ]; then + notmuch_counter_state_path="$TMP_DIRECTORY/notmuch_counter.state" + cat >"$notmuch_counter_command" < "$notmuch_counter_state_path" + +exec notmuch "\$@" +EOF + chmod +x "$notmuch_counter_command" || return + fi + + echo 0 > "$notmuch_counter_state_path" +} + +# Returns the current notmuch counter value. +notmuch_counter_value () { + if [ -r "$notmuch_counter_state_path" ]; then + read count < "$notmuch_counter_state_path" + else + count=0 + fi + echo $count +} + test_reset_state_ () { test -z "$test_init_done_" && test_init_ -- 1.7.7.3