[prev in list] [next in list] [prev in thread] [next in thread]
List: git
Subject: Re: [PATCH v1.1 1/2] t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'
From: Junio C Hamano <gitster () pobox ! com>
Date: 2018-03-08 23:44:33
Message-ID: xmqqvae66ske.fsf () gitster-ct ! c ! googlers ! com
[Download RAW message or body]
SZEDER Gábor <szeder.dev@gmail.com> writes:
> On Fri, Mar 9, 2018 at 12:33 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> SZEDER Gábor <szeder.dev@gmail.com> writes:
>>
>>> diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
>>> index c30660d606..5ff3789199 100755
>>> --- a/t/t9400-git-cvsserver-server.sh
>>> +++ b/t/t9400-git-cvsserver-server.sh
>>> @@ -449,10 +449,9 @@ test_expect_success 'cvs update (-p)' '
>>> GIT_CONFIG="$git_config" cvs update &&
>>> rm -f failures &&
>>> for i in merge no-lf empty really-empty; do
>>> - GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
>>> - test_cmp $i.out ../$i >>failures 2>&1
>>> - done &&
>>> - test -z "$(cat failures)"
>>> + GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
>>> + test_cmp $i.out ../$i || return 1
>>> + done
>>> '
>>
>> This makes "rm -f failures &&" unnecessary, no?
>
> Indeed, it does.
OK, no need to resend, as I'll amend it locally before queuing
(unless there is something else that needs updating, that is).
Thanks.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic