undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Thomas Rast 2013-06-18 14:25:59 +02:00 committed by Junio C Hamano
parent e6a6ddc93a
commit ae75342cff
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/test-lib-functions.sh
View File

@ -343,6 +343,7 @@ test_declared_prereq () {
} }
test_expect_failure () { test_expect_failure () {
test_start_
test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-failure" 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" test_known_broken_failure_ "$1"
fi fi
fi fi
echo >&3 "" test_finish_
} }
test_expect_success () { test_expect_success () {
test_start_
test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-success" error "bug in the test script: not 2 or 3 parameters to test-expect-success"
@ -375,7 +377,7 @@ test_expect_success () {
test_failure_ "$@" test_failure_ "$@"
fi fi
fi fi
echo >&3 "" test_finish_
} }
# test_external runs external test scripts that provide continuous # test_external runs external test scripts that provide continuous

9
t/test-lib.sh
View File

@ -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= to_skip=
if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
then then