# Mini bug report origin/pu: t1512 failed on Mac OS X (commit 957d74062c1f0e ?) 7 messages from 2012-07-11 to 2012-07-13. Participants: Torsten Bögershausen, Junio C Hamano, Johannes Sixt, Stefano Lattarini. Thread: https://gitlist.dev/t/30996 ## Torsten Bögershausen, 2012-07-11 20:09 Subject: Mini bug report origin/pu: t1512 failed on Mac OS X (commit 957d74062c1f0e ?) Message-ID: <4FFDDD5E.3080309@web.de> URL: https://gitlist.dev/e/4FFDDD5E.3080309%40web.de ``` The following tweak will make t1512 work on my Mac OS box: --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -257,7 +257,7 @@ test_expect_success 'rev-parse --disambiguate' ' # commits created by commit-tree in earlier tests do not share # the prefix. git rev-parse --disambiguate=000000000 >actual && - test "$(wc -l URL: https://gitlist.dev/e/7vipdtdhla.fsf%40alter.siamese.dyndns.org In-Reply-To: <4FFDDD5E.3080309@web.de> ``` Torsten Bögershausen writes: > The following tweak will make t1512 work on my Mac OS box: > > > --- a/t/t1512-rev-parse-disambiguation.sh > +++ b/t/t1512-rev-parse-disambiguation.sh > @@ -257,7 +257,7 @@ test_expect_success 'rev-parse --disambiguate' ' > # commits created by commit-tree in earlier tests do not share > # the prefix. > git rev-parse --disambiguate=000000000 >actual && > - test "$(wc -l + test "$(wc -l URL: https://gitlist.dev/e/7va9z5dgff.fsf%40alter.siamese.dyndns.org In-Reply-To: <7vipdtdhla.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > I think the other tests in t/ prefer to unquote it so that we would > ignore spaces around "wc -l" output, i.e. > > test $(wc -l > Thanks for a report. -- >8 -- Subject: [PATCH] t1512: ignore whitespaces in wc -l output Some implementations of sed (e.g. MacOS X) have whitespaces in the output of "wc -l" that reads from the standard input. Ignore these whitespaces by not quoting the command substitution to be compared with the constant "16". Signed-off-by: Junio C Hamano --- t/t1512-rev-parse-disambiguation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 3ed7558..1eb3514 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -257,7 +257,7 @@ test_expect_success 'rev-parse --disambiguate' ' # commits created by commit-tree in earlier tests do not share # the prefix. git rev-parse --disambiguate=000000000 >actual && - test "$(wc -l URL: https://gitlist.dev/e/4FFE7AEA.6060001%40viscovery.net In-Reply-To: <7va9z5dgff.fsf@alter.siamese.dyndns.org> ``` Am 7/12/2012 1:30, schrieb Junio C Hamano: > - test "$(wc -l + test $(wc -l URL: https://gitlist.dev/e/7vy5moc3w0.fsf%40alter.siamese.dyndns.org In-Reply-To: <4FFE7AEA.6060001@viscovery.net> ``` Johannes Sixt writes: > Am 7/12/2012 1:30, schrieb Junio C Hamano: >> - test "$(wc -l > + test $(wc -l > We have a helper function for this: > > test_line_count = 16 actual && OK. ``` ## Stefano Lattarini, 2012-07-13 22:43 Subject: Re: Mini bug report origin/pu: t1512 failed on Mac OS X (commit 957d74062c1f0e ?) Message-ID: <5000A483.4090307@gmail.com> URL: https://gitlist.dev/e/5000A483.4090307%40gmail.com In-Reply-To: <7va9z5dgff.fsf@alter.siamese.dyndns.org> ``` On 07/12/2012 01:30 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> I think the other tests in t/ prefer to unquote it so that we would >> ignore spaces around "wc -l" output, i.e. >> >> test $(wc -l > >> Thanks for a report. > > -- >8 -- > Subject: [PATCH] t1512: ignore whitespaces in wc -l output > > Some implementations of sed (e.g. MacOS X) > 'sed'? Shouldn't this read 'wc'? > have whitespaces in the output of "wc -l" that reads from the standard > input. > FYI, the extra space is present with Solaris wc as well: $ wc -l URL: https://gitlist.dev/e/7vk3y76xwu.fsf%40alter.siamese.dyndns.org In-Reply-To: <5000A483.4090307@gmail.com> ``` Stefano Lattarini writes: > On 07/12/2012 01:30 AM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> I think the other tests in t/ prefer to unquote it so that we would >>> ignore spaces around "wc -l" output, i.e. >>> >>> test $(wc -l >> >>> Thanks for a report. >> >> -- >8 -- >> Subject: [PATCH] t1512: ignore whitespaces in wc -l output >> >> Some implementations of sed (e.g. MacOS X) >> > 'sed'? Shouldn't this read 'wc'? Heh, funny typo. I don't know what I was thinking. ```