Browse Source

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>
maint
Elijah Newren 15 years ago committed by Junio C Hamano
parent
commit
dd5685818b
  1. 4
      t/t3509-cherry-pick-merge-df.sh
  2. 2
      t/t9350-fast-export.sh

4
t/t3509-cherry-pick-merge-df.sh

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
test_description='Test cherry-pick with directory/file conflicts'
. ./test-lib.sh

test_expect_success 'Setup rename across paths each below D/F conflicts' '
test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
mkdir a &&
>a/f &&
git add a &&
@ -26,7 +26,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' ' @@ -26,7 +26,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' '
git commit -m f1
'

test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' '
git reset --hard &&
git checkout master^0 &&
git cherry-pick branch

2
t/t9350-fast-export.sh

@ -376,7 +376,7 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' @@ -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 &&
(

Loading…
Cancel
Save