* [PATCH] Work around broken ln on solaris as used in t8006
@ 2011-03-20 23:59 Ben Walton
2011-03-21 0:45 ` Ben Walton
2011-03-21 1:02 ` Junio C Hamano
0 siblings, 2 replies; 6+ messages in thread
From: Ben Walton @ 2011-03-20 23:59 UTC (permalink / raw)
To: git; +Cc: Ben Walton
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] Work around broken ln on solaris as used in t8006
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
1 sibling, 0 replies; 6+ messages in thread
From: Ben Walton @ 2011-03-21 0:45 UTC (permalink / raw)
To: git; +Cc: Ben Walton
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 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>
---
Fixed typo in the original submission...
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Work around broken ln on solaris as used in t8006
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
2011-03-21 1:10 ` Ben Walton
1 sibling, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2011-03-21 1:02 UTC (permalink / raw)
To: Ben Walton; +Cc: git
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"
> '
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Work around broken ln on solaris as used in t8006
2011-03-21 1:02 ` Junio C Hamano
@ 2011-03-21 1:10 ` Ben Walton
2011-03-21 1:12 ` Ben Walton
0 siblings, 1 reply; 6+ messages in thread
From: Ben Walton @ 2011-03-21 1:10 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Excerpts from Junio C Hamano's message of Sun Mar 20 21:02:13 -0400 2011:
Hi Junio,
> > 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.
Yes, I caught that right after send. A follow up corrected it, but
I'll resubmit taking your feedback below into account.
> 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?
I think you're right about this. They should be logically grouped.
I'll send an update shortly.
Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Work around broken ln on solaris as used in t8006
2011-03-21 1:10 ` Ben Walton
@ 2011-03-21 1:12 ` Ben Walton
2011-03-21 5:00 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Ben Walton @ 2011-03-21 1:12 UTC (permalink / raw)
To: gitster, git; +Cc: Ben Walton
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 changes the setup to rm the symlink and then create the new
one 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..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"
'
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-21 5:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2011-03-21 1:10 ` Ben Walton
2011-03-21 1:12 ` Ben Walton
2011-03-21 5:00 ` Junio C Hamano
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).