git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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
Mar 8, 2018, 23:44 UTC
Message-ID
<xmqqvae66ske.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CAM0VKjkkFR-zVQMMqp0pJn489bV1uqEHZkB8Mo789J0K+qO3vA@mail.gmail.com>
SZEDER Gábor <szeder.dev@gmail.com> writes:
Show 23 quoted lines
> 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.
Previous: SZEDER GáborNext: SZEDER Gábor
Message 12 of 14 in “Make cvs tests pass with '-x' tracing and /bin/sh”
  1. 0/2 Make cvs tests pass with '-x' tracing and /bin/shSZEDER Gábor, Mar 8, 2018
  2. 2/2 t9402-git-cvsserver-refs: don't check the stderr of a subshellSZEDER Gábor, Mar 8, 2018
  3. 1/2 t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'SZEDER Gábor, Mar 8, 2018
  4. Eric SunshineMar 8, 2018
  5. SZEDER GáborMar 8, 2018
  6. Eric SunshineMar 8, 2018
  7. Eric SunshineMar 8, 2018
  8. SZEDER GáborMar 8, 2018
  9. 1/2 t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'SZEDER Gábor, Mar 8, 2018
  10. Junio C HamanoMar 8, 2018
  11. SZEDER GáborMar 8, 2018
  12. Junio C HamanoMar 8, 2018
  13. SZEDER GáborMar 9, 2018
  14. Jeff KingMar 13, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.