t/t5503-tagfollow: change from skip_all=* to prereq skip
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>
Ævar Arnfjörð Bjarmason committed
Aug 11, 2010 at 19:04 UTC
49f32489d3c436206acf988ccc99e06df4f3ed41
1 file changed
+24
-9
t/t5503-tagfollow.sh
+24
-9
@@ -6,8 +6,11 @@ test_description='test automatic tag following'
6
7
case $(uname -s) in
8
*MINGW*)
9
- skip_all="GIT_DEBUG_SEND_PACK not supported - skipping tests"
10
- test_done
9
+ say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
10
+ ;;
11
+*)
12
+ test_set_prereq NOT_MINGW
13
+ ;;
14
esac
15
16
# End state of the repository:
@@ -19,7 +22,7 @@ esac
22
# \ C - origin/cat \
23
# origin/master master
24
22
-test_expect_success setup '
25
+test_expect_success NOT_MINGW setup '
26
test_tick &&
27
echo ichi >file &&
28
git add file &&
@@ -42,12 +45,15 @@ test_expect_success setup '
45
46
U=UPLOAD_LOG
47
48
+test_expect_success NOT_MINGW 'setup expect' '
49
cat - <<EOF >expect
50
#S
51
want $A
52
#E
53
EOF
50
-test_expect_success 'fetch A (new commit : 1 connection)' '
54
+'
55
+
56
+test_expect_success NOT_MINGW 'fetch A (new commit : 1 connection)' '
57
rm -f $U
58
(
59
cd cloned &&
@@ -59,7 +65,7 @@ test_expect_success 'fetch A (new commit : 1 connection)' '
65
test_cmp expect actual
66
'
67
62
-test_expect_success "create tag T on A, create C on branch cat" '
68
+test_expect_success NOT_MINGW "create tag T on A, create C on branch cat" '
69
git tag -a -m tag1 tag1 $A &&
70
T=$(git rev-parse --verify tag1) &&
71
@@ -71,13 +77,16 @@ test_expect_success "create tag T on A, create C on branch cat" '
77
git checkout master
78
'
79
80
+test_expect_success NOT_MINGW 'setup expect' '
81
cat - <<EOF >expect
82
#S
83
want $C
84
want $T
85
#E
86
EOF
80
-test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '
87
+'
88
+
89
+test_expect_success NOT_MINGW 'fetch C, T (new branch, tag : 1 connection)' '
90
rm -f $U
91
(
92
cd cloned &&
@@ -91,7 +100,7 @@ test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '
100
test_cmp expect actual
101
'
102
94
-test_expect_success "create commits O, B, tag S on B" '
103
+test_expect_success NOT_MINGW "create commits O, B, tag S on B" '
104
test_tick &&
105
echo O >file &&
106
git add file &&
@@ -107,13 +116,16 @@ test_expect_success "create commits O, B, tag S on B" '
116
S=$(git rev-parse --verify tag2)
117
'
118
119
+test_expect_success NOT_MINGW 'setup expect' '
120
cat - <<EOF >expect
121
#S
122
want $B
123
want $S
124
#E
125
EOF
116
-test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
126
+'
127
+
128
+test_expect_success NOT_MINGW 'fetch B, S (commit and tag : 1 connection)' '
129
rm -f $U
130
(
131
cd cloned &&
@@ -127,13 +139,16 @@ test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
139
test_cmp expect actual
140
'
141
142
+test_expect_success NOT_MINGW 'setup expect' '
143
cat - <<EOF >expect
144
#S
145
want $B
146
want $S
147
#E
148
EOF
136
-test_expect_success 'new clone fetch master and tags' '
149
+'
150
+
151
+test_expect_success NOT_MINGW 'new clone fetch master and tags' '
152
git branch -D cat
153
rm -f $U
154
(