From: Junio C Hamano <gitster@pobox.com>
To: Ben Walton <bwalton@artsci.utoronto.ca>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Work around broken ln on solaris as used in t8006
Date: Sun, 20 Mar 2011 18:02:13 -0700 [thread overview]
Message-ID: <7vd3lluvze.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1300665586-24512-1-git-send-email-bwalton@artsci.utoronto.ca> (Ben Walton's message of "Sun, 20 Mar 2011 19:59:46 -0400")
Ben Walton <bwalton@artsci.utoronto.ca> writes:
> 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.
Thanks for reporting. I recall "ln -s -f" traditionally has been a pain
point not just on Solaris.
> 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.
s/uses //; I think.
It is curious why "rm symlink.bin" is not inside the test-have-prereq
part, iow, immediately before the problematic "ln -s", where it logically
belongs to, though. What does the updated code do on systems without
symbolic link support?
> 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"
> '
next prev parent reply other threads:[~2011-03-21 1:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-20 23:59 [PATCH] Work around broken ln on solaris as used in t8006 Ben Walton
2011-03-21 0:45 ` Ben Walton
2011-03-21 1:02 ` Junio C Hamano [this message]
2011-03-21 1:10 ` Ben Walton
2011-03-21 1:12 ` Ben Walton
2011-03-21 5:00 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vd3lluvze.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bwalton@artsci.utoronto.ca \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).