Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
mingw: mark t9100's test cases with appropriate prereqs
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Wed, 27 Jan 2016 16:20:08 +0000
(17:20 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 28 Jan 2016 21:36:10 +0000
(13:36 -0800)
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>
t/t9100-git-svn-basic.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
2b3abd4
)
diff --git
a/t/t9100-git-svn-basic.sh
b/t/t9100-git-svn-basic.sh
index 4fea8d901bbc0f713a1500adbbdd2e5886720f47..5464b5bd14c41d583701f094c2a6e2885ab48e4a 100755
(executable)
--- a/
t/t9100-git-svn-basic.sh
+++ b/
t/t9100-git-svn-basic.sh
@@
-30,8
+30,7
@@
test_expect_success \
echo "deep dir" >dir/a/b/c/d/e/file &&
mkdir bar &&
echo "zzz" >bar/zzz &&
echo "deep dir" >dir/a/b/c/d/e/file &&
mkdir bar &&
echo "zzz" >bar/zzz &&
- echo "#!/bin/sh" >exec.sh &&
- chmod +x exec.sh &&
+ write_script exec.sh </dev/null &&
svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
) &&
rm -rf import &&
svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
) &&
rm -rf import &&
@@
-117,7
+116,7
@@
test_expect_success "$name" '
name='remove executable bit from a file'
name='remove executable bit from a file'
-test_expect_success "$name" '
+test_expect_success
POSIXPERM
"$name" '
rm -f "$GIT_DIR"/index &&
git checkout -f -b mybranch5 ${remotes_git_svn} &&
chmod -x exec.sh &&
rm -f "$GIT_DIR"/index &&
git checkout -f -b mybranch5 ${remotes_git_svn} &&
chmod -x exec.sh &&
@@
-130,7
+129,7
@@
test_expect_success "$name" '
name='add executable bit back file'
name='add executable bit back file'
-test_expect_success "$name" '
+test_expect_success
POSIXPERM
"$name" '
chmod +x exec.sh &&
git update-index exec.sh &&
git commit -m "$name" &&
chmod +x exec.sh &&
git update-index exec.sh &&
git commit -m "$name" &&
@@
-141,7
+140,7
@@
test_expect_success "$name" '
name='executable file becomes a symlink to file'
name='executable file becomes a symlink to file'
-test_expect_success "$name" '
+test_expect_success
SYMLINKS
"$name" '
rm exec.sh &&
ln -s file exec.sh &&
git update-index exec.sh &&
rm exec.sh &&
ln -s file exec.sh &&
git update-index exec.sh &&
@@
-153,7
+152,7
@@
test_expect_success "$name" '
name='new symlink is added to a file that was also just made executable'
name='new symlink is added to a file that was also just made executable'
-test_expect_success "$name" '
+test_expect_success
POSIXPERM,SYMLINKS
"$name" '
chmod +x file &&
ln -s file exec-2.sh &&
git update-index --add file exec-2.sh &&
chmod +x file &&
ln -s file exec-2.sh &&
git update-index --add file exec-2.sh &&
@@
-165,7
+164,7
@@
test_expect_success "$name" '
test -h "$SVN_TREE"/exec-2.sh'
name='modify a symlink to become a file'
test -h "$SVN_TREE"/exec-2.sh'
name='modify a symlink to become a file'
-test_expect_success "$name" '
+test_expect_success
POSIXPERM,SYMLINKS
"$name" '
echo git help >help &&
rm exec-2.sh &&
cp help exec-2.sh &&
echo git help >help &&
rm exec-2.sh &&
cp help exec-2.sh &&
@@
-181,7
+180,8
@@
test_expect_success "$name" '
name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
LC_ALL="$GIT_SVN_LC_ALL"
export LC_ALL
name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
LC_ALL="$GIT_SVN_LC_ALL"
export LC_ALL
-test_expect_success UTF8 "$name" "
+# This test relies on the previous test, hence requires POSIXPERM,SYMLINKS
+test_expect_success UTF8,POSIXPERM,SYMLINKS "$name" "
echo '# hello' >> exec-2.sh &&
git update-index exec-2.sh &&
git commit -m 'éï∏' &&
echo '# hello' >> exec-2.sh &&
git update-index exec-2.sh &&
git commit -m 'éï∏' &&
@@
-214,7
+214,7
@@
tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
EOF
tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
EOF
-test_expect_success "$name" "test_cmp a expected"
+test_expect_success
POSIXPERM,SYMLINKS
"$name" "test_cmp a expected"
test_expect_success 'exit if remote refs are ambigious' "
git config --add svn-remote.svn.fetch \
test_expect_success 'exit if remote refs are ambigious' "
git config --add svn-remote.svn.fetch \