global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 11:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  test-lib: TAP compliance for skipping tests on request
  test-lib: simplify GIT_SKIP_TESTS loop
This commit is contained in:
Junio C Hamano
2010-07-12 11:48:29 -07:00
parent 2da38a21bb 637ab29b86
commit f32a9d2ce0
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
t/test-lib.sh
View File

@@ -385,6 +385,7 @@ test_skip () {
case $this_test.$test_count in
$skp)
to_skip=t
break
esac
done
if test -z "$to_skip" && test -n "$prereq" &&
@@ -395,7 +396,7 @@ test_skip () {
case "$to_skip" in
t)
say_color skip >&3 "skipping test: $@"
say_color skip "ok $test_count: # skip $1"
say_color skip "ok $test_count # skip $1"
: true
;;
*)
@@ -829,18 +830,10 @@ this_test=${0##*/}
this_test=${this_test%%-*}
for skp in $GIT_SKIP_TESTS
do
to_skip=
for skp in $GIT_SKIP_TESTS
do
case "$this_test" in
$skp)
to_skip=t
esac
done
case "$to_skip" in
t)
case "$this_test" in
$skp)
say_color skip >&3 "skipping test $this_test altogether"
say_color skip "skip all tests in $this_test"
skip_all="skip all tests in $this_test"
test_done
esac
done