mingw: mark t9100's test cases with appropriate prereqs
Many a test requires either POSIXPERM (to change the executable bit) or SYMLINKS, and neither are available on Windows. This lets t9100-git-svn-basic.sh pass in Git for Windows' SDK. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 27, 2016 at 17:20 UTC
bcb11f19e070d4647efe66400924bdddb65cd936
1 file changed
+9
-9
t/t9100-git-svn-basic.sh
+9
-9
@@ -30,8 +30,7 @@ test_expect_success \
30
echo "deep dir" >dir/a/b/c/d/e/file &&
31
mkdir bar &&
32
echo "zzz" >bar/zzz &&
33
- echo "#!/bin/sh" >exec.sh &&
34
- chmod +x exec.sh &&
33
+ write_script exec.sh </dev/null &&
34
svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
35
) &&
36
rm -rf import &&
@@ -117,7 +116,7 @@ test_expect_success "$name" '
116
117
118
name='remove executable bit from a file'
120
-test_expect_success "$name" '
119
+test_expect_success POSIXPERM "$name" '
120
rm -f "$GIT_DIR"/index &&
121
git checkout -f -b mybranch5 ${remotes_git_svn} &&
122
chmod -x exec.sh &&
@@ -130,7 +129,7 @@ test_expect_success "$name" '
129
130
131
name='add executable bit back file'
133
-test_expect_success "$name" '
132
+test_expect_success POSIXPERM "$name" '
133
chmod +x exec.sh &&
134
git update-index exec.sh &&
135
git commit -m "$name" &&
@@ -141,7 +140,7 @@ test_expect_success "$name" '
140
141
142
name='executable file becomes a symlink to file'
144
-test_expect_success "$name" '
143
+test_expect_success SYMLINKS "$name" '
144
rm exec.sh &&
145
ln -s file exec.sh &&
146
git update-index exec.sh &&
@@ -153,7 +152,7 @@ test_expect_success "$name" '
152
153
name='new symlink is added to a file that was also just made executable'
154
156
-test_expect_success "$name" '
155
+test_expect_success POSIXPERM,SYMLINKS "$name" '
156
chmod +x file &&
157
ln -s file exec-2.sh &&
158
git update-index --add file exec-2.sh &&
@@ -165,7 +164,7 @@ test_expect_success "$name" '
164
test -h "$SVN_TREE"/exec-2.sh'
165
166
name='modify a symlink to become a file'
168
-test_expect_success "$name" '
167
+test_expect_success POSIXPERM,SYMLINKS "$name" '
168
echo git help >help &&
169
rm exec-2.sh &&
170
cp help exec-2.sh &&
@@ -181,7 +180,8 @@ test_expect_success "$name" '
180
name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
181
LC_ALL="$GIT_SVN_LC_ALL"
182
export LC_ALL
184
-test_expect_success UTF8 "$name" "
183
+# This test relies on the previous test, hence requires POSIXPERM,SYMLINKS
184
+test_expect_success UTF8,POSIXPERM,SYMLINKS "$name" "
185
echo '# hello' >> exec-2.sh &&
186
git update-index exec-2.sh &&
187
git commit -m 'éï∏' &&
@@ -214,7 +214,7 @@ tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
214
tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
215
EOF
216
217
-test_expect_success "$name" "test_cmp a expected"
217
+test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
218
219
test_expect_success 'exit if remote refs are ambigious' "
220
git config --add svn-remote.svn.fetch \