Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 0a77793

Browse files
committed
test: Differentiate ability for gnu utils to handle symlinks from git
t7800 failed under symlink enabled msysgit without symlink enabled perl/msys Signed-off-by: Michael Geddes <[email protected]>
1 parent 1919ecf commit 0a77793

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

t/t7800-difftool.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ do
371371
done >actual
372372
EOF
373373

374-
test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstaged changes' '
374+
test_expect_success PERL,SYMLINKS_SH 'difftool --dir-diff --symlink without unstaged changes' '
375375
cat >expect <<-EOF &&
376376
file
377377
$(pwd)/file

t/test-lib.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,12 @@ test_lazy_prereq SYMLINKS '
958958
touch x
959959
ln -s x y && test -h y
960960
'
961+
test_lazy_prereq SYMLINKS_SH '
962+
# test whether the filesystem supports symbolic links
963+
touch x
964+
# Then check it is supported by the shell (not using overridden test)
965+
ln -s x y && builtin test -h y
966+
'
961967

962968
test_lazy_prereq FILEMODE '
963969
test "$(git config --bool core.filemode)" = true

0 commit comments

Comments
 (0)