From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Rast Subject: [PATCH v4 3/8] test-lib: rearrange start/end of test_expect_* and test_skip Date: Sun, 23 Jun 2013 20:12:54 +0200 Message-ID: <6768d2c43cc7f34b70a493f5ac5fee1571b60f78.1372010917.git.trast@inf.ethz.ch> References: Mime-Version: 1.0 Content-Type: text/plain Cc: , Fredrik Gustafsson , Jeff King To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Jun 23 20:13:46 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UqonJ-0007pi-LZ for gcvg-git-2@plane.gmane.org; Sun, 23 Jun 2013 20:13:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752292Ab3FWSNc (ORCPT ); Sun, 23 Jun 2013 14:13:32 -0400 Received: from edge10.ethz.ch ([82.130.75.186]:34489 "EHLO edge10.ethz.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040Ab3FWSNE (ORCPT ); Sun, 23 Jun 2013 14:13:04 -0400 Received: from CAS11.d.ethz.ch (172.31.38.211) by edge10.ethz.ch (82.130.75.186) with Microsoft SMTP Server (TLS) id 14.2.298.4; Sun, 23 Jun 2013 20:12:55 +0200 Received: from hexa.v.cablecom.net (46.126.8.85) by CAS11.d.ethz.ch (172.31.38.211) with Microsoft SMTP Server (TLS) id 14.2.298.4; Sun, 23 Jun 2013 20:13:01 +0200 X-Mailer: git-send-email 1.8.3.1.727.gcbe3af3 In-Reply-To: X-Originating-IP: [46.126.8.85] Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This moves * the early setup part from test_skip to a new function test_start_ * the final common parts of test_expect_* to a new function test_finish_ to make the next commit more obvious. Signed-off-by: Thomas Rast --- t/test-lib-functions.sh | 6 ++++-- t/test-lib.sh | 9 ++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 8828ff7..a7e9aac 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -343,6 +343,7 @@ test_declared_prereq () { } test_expect_failure () { + test_start_ test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test-expect-failure" @@ -357,10 +358,11 @@ test_expect_failure () { test_known_broken_failure_ "$1" fi fi - echo >&3 "" + test_finish_ } test_expect_success () { + test_start_ test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test-expect-success" @@ -375,7 +377,7 @@ test_expect_success () { test_failure_ "$@" fi fi - echo >&3 "" + test_finish_ } # test_external runs external test scripts that provide continuous diff --git a/t/test-lib.sh b/t/test-lib.sh index 4fa141a..e99b0ea 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -369,8 +369,15 @@ test_run_ () { return "$eval_ret" } -test_skip () { +test_start_ () { test_count=$(($test_count+1)) +} + +test_finish_ () { + echo >&3 "" +} + +test_skip () { to_skip= if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS then -- 1.8.3.1.727.gcbe3af3