summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorBen Walton <bwalton@artsci.utoronto.ca>2011-03-21 01:12:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-21 04:58:09 (GMT)
commitc3786c8472093ec01b73a71a56f405932044a67e (patch)
tree215f76fd15941fba9da4eb8ca07e61c8d746eb34 /t
parent9aec68d3ea935fcb778a3580d950cf20d5bd35f6 (diff)
downloadgit-c3786c8472093ec01b73a71a56f405932044a67e.zip
git-c3786c8472093ec01b73a71a56f405932044a67e.tar.gz
git-c3786c8472093ec01b73a71a56f405932044a67e.tar.bz2
Work around broken ln on solaris as used in t8006
The test setup in t8006-blame-textconv.sh uses "ln -sf" to overwrite an existing symlink. Unfortunately, both /usr/bin/ln and /usr/xpg4/bin/ln on solaris 9 don't properly handle -f and -s used at the same time. This caused the test setup and subsequent checks to fail. Instead, remove the symlink and then create a new one in the setup code. The upstream Solaris bug (fixed in 10, but not 9) is documented here: http://bugs.opensolaris.org/view_bug.do?bug_id=4372462 Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t8006-blame-textconv.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
index ea64cd8..32ec82a 100755
--- a/t/t8006-blame-textconv.sh
+++ b/t/t8006-blame-textconv.sh
@@ -25,7 +25,8 @@ test_expect_success 'setup ' '
echo "bin: test 1 version 2" >one.bin &&
echo "bin: test number 2 version 2" >>two.bin &&
if test_have_prereq SYMLINKS; then
- ln -sf two.bin symlink.bin
+ rm symlink.bin &&
+ ln -s two.bin symlink.bin
fi &&
GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
'