Mark tests that use symlinks as needing SYMLINKS prerequisite
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 12, 2010 at 20:09 UTC
dd5685818bca9b0cadc61a87c6470fa7df227302
2 files changed
+3
-3
t/t3509-cherry-pick-merge-df.sh
+2
-2
@@ -3,7 +3,7 @@
3
test_description='Test cherry-pick with directory/file conflicts'
4
. ./test-lib.sh
5
6
-test_expect_success 'Setup rename across paths each below D/F conflicts' '
6
+test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
7
mkdir a &&
8
>a/f &&
9
git add a &&
@@ -26,7 +26,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' '
26
git commit -m f1
27
'
28
29
-test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
29
+test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' '
30
git reset --hard &&
31
git checkout master^0 &&
32
git cherry-pick branch
t/t9350-fast-export.sh
+1
-1
@@ -376,7 +376,7 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
376
test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
377
test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
378
379
-test_expect_success 'directory becomes symlink' '
379
+test_expect_success SYMLINKS 'directory becomes symlink' '
380
git init dirtosymlink &&
381
git init result &&
382
(