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 13651429E2E for ; Wed, 16 Nov 2011 17:57:07 -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 p04C79ax81a4 for ; Wed, 16 Nov 2011 17:57:06 -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 6740F429E3B for ; Wed, 16 Nov 2011 17:56:58 -0800 (PST) Received: by mail-bw0-f53.google.com with SMTP id q10so1456807bka.26 for ; Wed, 16 Nov 2011 17:56: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:in-reply-to:references; bh=j5949cCO3Knke4hIDS2+gJKF+o7WUpbvNP6GdE5jIJo=; b=uUy38omGdFSykBDfMvcAB/N39wzoZn5VxOKFgLyY8S8kzbMW9R7ayf7IvUB4ulmVR4 fX2I0T9X1d/gdvvUm1dsPug/m8Ef+gcKlVYjP9GMFNT1SFPh2zKASI50drFwmTg4+29h h5X6lLmWalCR56IjCNXbwEJ3CLguhYZL5BGKs= Received: by 10.204.9.204 with SMTP id m12mr4654093bkm.131.1321495018104; Wed, 16 Nov 2011 17:56:58 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id c4sm3473104bkk.13.2011.11.16.17.56.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Nov 2011 17:56:57 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH 5/9] test: fix "skipping test" verbose output Date: Thu, 17 Nov 2011 05:56:22 +0400 Message-Id: <1321494986-18998-6-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.7.2 In-Reply-To: <1321494986-18998-1-git-send-email-dmitry.kurochkin@gmail.com> References: <1321494986-18998-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: Thu, 17 Nov 2011 01:57:07 -0000 --- test/test-lib.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index ab8c6fd..acac8ca 100755 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -635,41 +635,42 @@ test_skip () { test_report_skip_ "$@" ;; *) test_check_missing_external_prereqs_ "$@" ;; esac } test_check_missing_external_prereqs_ () { if test -n "$test_subtest_missing_external_prereqs_"; then say_color skip >&3 "missing prerequisites:" echo "$test_subtest_missing_external_prereqs_" >&3 test_report_skip_ "$@" else false fi } test_report_skip_ () { test_reset_state_ - say_color skip >&3 "skipping test: $@" + say_color skip >&3 "skipping test:" + echo " $@" >&3 say_color skip "%-6s" "SKIP" echo " $1" } test_subtest_known_broken () { test_subtest_known_broken_=t } test_expect_success () { test "$#" = 3 && { prereq=$1; shift; } || prereq= test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test-expect-success" test_reset_state_ if ! test_skip "$@" then test_run_ "$2" run_ret="$?" # test_run_ may update missing external prerequisites test_check_missing_external_prereqs_ "$@" || if [ "$run_ret" = 0 -a "$eval_ret" = 0 ] -- 1.7.7.2