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

t/t5503-tagfollow: change from skip_all=* to prereq skip

Browse Source 
Change this test to skip test with test prerequisites, and to do setup
work in tests. This improves the skipped statistics on platforms where
the test isn't run.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2010-08-11 19:04:07 +00:00 committed by Junio C Hamano
parent fab68aa2ba
commit 49f32489d3
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
t/t5503-tagfollow.sh
View File

@ -6,8 +6,11 @@ test_description='test automatic tag following'
case $(uname -s) in case $(uname -s) in
*MINGW*) *MINGW*)
skip_all="GIT_DEBUG_SEND_PACK not supported - skipping tests" say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
test_done ;;
*)
test_set_prereq NOT_MINGW
;;
esac esac
# End state of the repository: # End state of the repository:
@ -19,7 +22,7 @@ esac
# \ C - origin/cat \ # \ C - origin/cat \
# origin/master master # origin/master master
test_expect_success setup ' test_expect_success NOT_MINGW setup '
test_tick && test_tick &&
echo ichi >file && echo ichi >file &&
git add file && git add file &&
@ -42,12 +45,15 @@ test_expect_success setup '
U=UPLOAD_LOG U=UPLOAD_LOG
test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect cat - <<EOF >expect
#S #S
want $A want $A
#E #E
EOF EOF
test_expect_success 'fetch A (new commit : 1 connection)' ' '
test_expect_success NOT_MINGW 'fetch A (new commit : 1 connection)' '
rm -f $U rm -f $U
( (
cd cloned && cd cloned &&
@ -59,7 +65,7 @@ test_expect_success 'fetch A (new commit : 1 connection)' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success "create tag T on A, create C on branch cat" ' test_expect_success NOT_MINGW "create tag T on A, create C on branch cat" '
git tag -a -m tag1 tag1 $A && git tag -a -m tag1 tag1 $A &&
T=$(git rev-parse --verify tag1) && T=$(git rev-parse --verify tag1) &&
@ -71,13 +77,16 @@ test_expect_success "create tag T on A, create C on branch cat" '
git checkout master git checkout master
' '
test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect cat - <<EOF >expect
#S #S
want $C want $C
want $T want $T
#E #E
EOF EOF
test_expect_success 'fetch C, T (new branch, tag : 1 connection)' ' '
test_expect_success NOT_MINGW 'fetch C, T (new branch, tag : 1 connection)' '
rm -f $U rm -f $U
( (
cd cloned && cd cloned &&
@ -91,7 +100,7 @@ test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success "create commits O, B, tag S on B" ' test_expect_success NOT_MINGW "create commits O, B, tag S on B" '
test_tick && test_tick &&
echo O >file && echo O >file &&
git add file && git add file &&
@ -107,13 +116,16 @@ test_expect_success "create commits O, B, tag S on B" '
S=$(git rev-parse --verify tag2) S=$(git rev-parse --verify tag2)
' '
test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect cat - <<EOF >expect
#S #S
want $B want $B
want $S want $S
#E #E
EOF EOF
test_expect_success 'fetch B, S (commit and tag : 1 connection)' ' '
test_expect_success NOT_MINGW 'fetch B, S (commit and tag : 1 connection)' '
rm -f $U rm -f $U
( (
cd cloned && cd cloned &&
@ -127,13 +139,16 @@ test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success NOT_MINGW 'setup expect' '
cat - <<EOF >expect cat - <<EOF >expect
#S #S
want $B want $B
want $S want $S
#E #E
EOF EOF
test_expect_success 'new clone fetch master and tags' ' '
test_expect_success NOT_MINGW 'new clone fetch master and tags' '
git branch -D cat git branch -D cat
rm -f $U rm -f $U
( (