Skip to content

Commit c3786c8

Browse files
Ben Waltongitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9aec68d commit c3786c8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/t8006-blame-textconv.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ test_expect_success 'setup ' '
2525
echo "bin: test 1 version 2" >one.bin &&
2626
echo "bin: test number 2 version 2" >>two.bin &&
2727
if test_have_prereq SYMLINKS; then
28-
ln -sf two.bin symlink.bin
28+
rm symlink.bin &&
29+
ln -s two.bin symlink.bin
2930
fi &&
3031
GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
3132
'

0 commit comments

Comments
 (0)