[PATCH 2/2] Mark tests that use symlinks as needing SYMLINKS prerequisite
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t3509-cherry-pick-merge-df.sh | 6 ++++++
t/t9350-fast-export.sh | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index 6e7ef84..93ad20d 100755
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -3,6 +3,12 @@
test_description='Test cherry-pick with directory/file conflicts'
. ./test-lib.sh
+if ! test_have_prereq SYMLINKS
+then
+ skip_all="symbolic links not supported - skipping tests"
+ test_done
+fi
+
test_expect_success 'Setup rename across paths each below D/F conflicts' '
mkdir a &&
>a/f &&
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 1ee1461..27aea5c 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -376,7 +376,7 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
-test_expect_success 'directory becomes symlink' '
+test_expect_success SYMLINKS 'directory becomes symlink' '
git init dirtosymlink &&
git init result &&
(
--
1.7.2.1.119.gca9fe.dirty
Elijah Newren <newren@gmail.com>