[PATCH] Work around broken ln on solaris as used in t8006
- From
Ben Walton <bwalton@artsci.utoronto.ca>
- Date
- Mar 20, 2011, 23:59 UTC
- Message-ID
- <1300665586-24512-1-git-send-email-bwalton@artsci.utoronto.ca>
The test setup in t8006-blame-textconv.sh used 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 when -s is used. This caused the test setup to fail which caused subsequent checks to also fail.
This patch uses changes the first check in the test to rm the symlink and then create the new symlink using only -s.
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> --- t/t8006-blame-textconv.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index ea64cd8..c5362d9 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -24,8 +24,9 @@ test_expect_success 'setup ' ' GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" && echo "bin: test 1 version 2" >one.bin && echo "bin: test number 2 version 2" >>two.bin && + rm symlink.bin && if test_have_prereq SYMLINKS; then - ln -sf two.bin 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" '
-- 1.7.1