test-lib: rearrange start/end of test_expect_* and test_skip

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 <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 52510094add59b508e1581ffebfa555e7249561c..ad6d60aaab15c5d7e9891e0e2a07789e2c3a9ecc 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -343,6 +343,7 @@ test_declared_prereq () {
 }
 
 test_expect_failure () {
 }
 
 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"
        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
                        test_known_broken_failure_ "$1"
                fi
        fi

-       echo >&3 ""
+       test_finish_

 }
 
 test_expect_success () {
 }
 
 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"
        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
                        test_failure_ "$@"
                fi
        fi

-       echo >&3 ""
+       test_finish_

 }
 
 # test_external runs external test scripts that provide continuous
 }
 
 # test_external runs external test scripts that provide continuous

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 4c583b033d7e60ce2c4d4a92f48fcf2af68b8003..0985ca5eb7a4ff2c496ac90732b1b28ad48116bb 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -369,8 +369,15 @@ test_run_ () {
        return "$eval_ret"
 }
 
        return "$eval_ret"
 }
 

-test_skip () {
+test_start_ () {

        test_count=$(($test_count+1))
        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
        to_skip=
        if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
        then