diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-04 15:15:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-04 15:15:36 (GMT) |
| commit | a2c6726417db22bea7a878aeb88e18bcc95e5c0c (patch) | |
| tree | c79a6a559dfd0445a86dcc87df024136ddf02b44 /t/t4115-apply-symlink.sh | |
| parent | b480d38dab815e780234d0887f4185afc3db1b64 (diff) | |
| parent | e4c62e640db3f704b4c27435c6b8efdb170988dc (diff) | |
| download | git-a2c6726417db22bea7a878aeb88e18bcc95e5c0c.zip git-a2c6726417db22bea7a878aeb88e18bcc95e5c0c.tar.gz git-a2c6726417db22bea7a878aeb88e18bcc95e5c0c.tar.bz2 | |
Merge branch 'ab/test-2'
* ab/test-2: (51 commits)
tests: factor HOME=$(pwd) in test-lib.sh
test-lib: use subshell instead of cd $new && .. && cd $old
tests: simplify "missing PREREQ" message
t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
test-lib: Allow overriding of TEST_DIRECTORY
test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
test: Introduce $GIT_BUILD_DIR
cvs tests: do not touch test CVS repositories shipped with source
t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
t/t7105-reset-patch.sh: Add a PERL prerequisite
t/t9001-send-email.sh: convert setup code to tests
t/t9001-send-email.sh: change from skip_all=* to prereq skip
t/t9001-send-email.sh: Remove needless PROG=* assignment
t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
lib-patch-mode tests: change from skip_all=* to prereq skip
t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
t/Makefile: Create test-results dir for smoke target
...
Conflicts:
t/t6035-merge-dir-to-symlink.sh
Diffstat (limited to 't/t4115-apply-symlink.sh')
| -rwxr-xr-x | t/t4115-apply-symlink.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh index aff4348..7674dd2 100755 --- a/t/t4115-apply-symlink.sh +++ b/t/t4115-apply-symlink.sh @@ -9,13 +9,7 @@ test_description='git apply symlinks and partial files . ./test-lib.sh -if ! test_have_prereq SYMLINKS -then - skip_all='Symbolic links not supported, skipping tests.' - test_done -fi - -test_expect_success setup ' +test_expect_success SYMLINKS setup ' ln -s path1/path2/path3/path4/path5 link1 && git add link? && @@ -34,7 +28,7 @@ test_expect_success setup ' ' -test_expect_success 'apply symlink patch' ' +test_expect_success SYMLINKS 'apply symlink patch' ' git checkout side && git apply patch && @@ -43,7 +37,7 @@ test_expect_success 'apply symlink patch' ' ' -test_expect_success 'apply --index symlink patch' ' +test_expect_success SYMLINKS 'apply --index symlink patch' ' git checkout -f side && git apply --index patch && |