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

RE: [ANNOUNCE] Git v2.21.0-rc2

From
Randall S. Becker <rsbecker@nexbridge.com>
Date
Feb 21, 2019, 15:54 UTC
Message-ID
<001501d4c9fd$bf80dfb0$3e829f10$@nexbridge.com>
In-Reply-To
<xmqqftsiw8l8.fsf@gitster-ct.c.googlers.com>
On February 20, 2019 14:42, Junio C Hamano wrote:
Show 29 quoted lines
> "Randall S. Becker" <rsbecker@nexbridge.com> writes:
> 
> > On February 19, 2019 18:29, Junio C Hamano wrote:
> >> A release candidate Git v2.21.0-rc2 is now available for testing at
> >> the usual places.  It is comprised of 474 non-merge commits since
> >> v2.20.0, contributed by 61 people, 16 of which are new faces.
> >
> > Thanks. t5562 works properly on NonStop (3 tests under various loads).
> > I am starting a full regression test now - see you in two days or so
> > with a full report.
> 
> Thanks.  In the end I ended up doing the following:
> 
>  - kept most of your "feed NULs generated from a helper program via
>    pipe, instead of reading from /dev/zero" patch,
> 
>  - replaced the helper program used in the above with the test-tool
>    one by Dscho,
> 
>  - used Max's "do not reuse the output file---the background writer
>    about to die may still have it open when the next test starts",
> 
>  - used Max's "when testing the program with overly large input
>    declared with content-length, do not have to feed from /dev/zero;
>    /dev/null suffices as a mistaken program attempting to read would
>    die when seeing EOF anyway" patch to reduce one mention of
>    /dev/zero (or one pipe from the helper output) further.
> 
> Hopefully Dscho's Azure thing would also be happy with one less use of
Perl
> script.
> 
> As I said earlier, a few places in t/ still mention /dev/zero and I think
it is a
Show 8 quoted lines
> real bug on platforms without /dev/zero in t4153:
> 
>     $ git grep -h dev/zero t/
>             test_must_fail test_terminal git am --3way </dev/zero &&
>             test_must_fail test_terminal git am --reject </dev/zero &&
> 
> Curiously, applying the attached patch and running the test on Linux would
> notice that we do not have such a device file, and the use of
test_must_fail
Show 15 quoted lines
> does *not* make it a-OK [*].  I am not sure why you are not getting hit by
> the same issue.
> 
> 	Side note: test_must_fail is to ensure that the command
> 	exits in a controlled way without segfault, so at the first
> 	glance, replacing /dev/zero with something nonsensical and
> 	nonexistent ought to make the command pass, but that is not
> 	the case.  The shell notices redirection failure and aborts
> 	the &&-chain.  This behaviour matches what we want, so I
> 	won't complain ;-)
> 
> Another mention of /dev/zero appears in t/helper/test-sha1.sh (not to be
> confused with t/helper/test-sha1.c).  This seems to be run only with an
> explicit "make -C t/helper check-sha1" request, so perhaps nobody on your
> platform ran it to get hit by it.  I wonder if anybody runs this on any
platform,
> to be honest, though.  Duy Cc'ed as the last person to touch that
particular
> target---yes, I know I was guilty of introducing it in b65bc21e
("Makefile: add
Show 30 quoted lines
> framework to verify and bench sha1 implementations.", 2006-06-24).
> 
>  t/t4153-am-resume-override-opts.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-
> override-opts.sh
> index 8ea22d1bcb..29ef22c94f 100755
> --- a/t/t4153-am-resume-override-opts.sh
> +++ b/t/t4153-am-resume-override-opts.sh
> @@ -40,7 +40,7 @@ test_expect_success TTY '--3way overrides --no-3way' '
> 
>  	# Applying side1 with am --3way will succeed due to the threeway-
> merge.
>  	# Applying side2 will fail as --3way does not apply to it.
> -	test_must_fail test_terminal git am --3way </dev/zero &&
> +	test_must_fail test_terminal git am --3way </dev/zarro &&
>  	test_path_is_dir .git/rebase-apply &&
>  	test side1 = "$(cat file2)"
>  '
> @@ -94,7 +94,7 @@ test_expect_success TTY '--reject overrides --no-reject'
> '
>  	test_path_is_dir .git/rebase-apply &&
>  	test_path_is_missing file.rej &&
> 
> -	test_must_fail test_terminal git am --reject </dev/zero &&
> +	test_must_fail test_terminal git am --reject </dev/zarro &&
>  	test_path_is_dir .git/rebase-apply &&
>  	test_path_is_file file.rej
>  '
Here's what we get with this patch (and without it):

/home/git/git/t: sh t4153-am-resume-override-opts.sh ok 1 - setup ok 2 # skip --3way overrides --no-3way (missing TTY) ok 3 - --no-quiet overrides --quiet ok 4 - --signoff overrides --no-signoff ok 5 # skip --reject overrides --no-reject (missing TTY) # passed all 5 test(s) 1..5

Technically, we have TTY, but not that dev. The TTYs are not under /dev/tty*, however.

Regards, Randall

Previous: Duy NguyenNext: Junio C Hamano
Message 8 of 25 in “[ANNOUNCE] Git v2.21.0-rc2”
  1. Junio C HamanoFeb 19, 2019
  2. Randall S. BeckerFeb 20, 2019
  3. Junio C HamanoFeb 20, 2019
  4. Johannes SchindelinFeb 20, 2019
  5. Duy NguyenFeb 21, 2019
  6. brian m. carlsonFeb 21, 2019
  7. Duy NguyenFeb 22, 2019
  8. Randall S. BeckerFeb 21, 2019
  9. Junio C HamanoFeb 21, 2019
  10. SZEDER GáborFeb 21, 2019
  11. Randall S. BeckerFeb 21, 2019
  12. Randall S. BeckerFeb 21, 2019
  13. Git for Windows v2.21.0-rc2, was Re: [ANNOUNCE] Git v2.21.0-rc2Johannes Schindelin, Feb 21, 2019
  14. 0/2 BSD portability fixes for 2.21.0-rc2Ævar Arnfjörð Bjarmason, Feb 21, 2019
  15. Josh SteadmonFeb 22, 2019
  16. 1/2 tests: fix unportable "\?" and "\+" regex syntaxÆvar Arnfjörð Bjarmason, Feb 21, 2019
  17. Junio C HamanoFeb 22, 2019
  18. 2/2 commit-graph tests: fix cryptic unportable "dd" invocationÆvar Arnfjörð Bjarmason, Feb 21, 2019
  19. SZEDER GáborFeb 21, 2019
  20. Ævar Arnfjörð BjarmasonFeb 21, 2019
  21. SZEDER GáborFeb 22, 2019
  22. Ævar Arnfjörð BjarmasonFeb 22, 2019
  23. Junio C HamanoFeb 22, 2019
  24. Todd ZullingerFeb 22, 2019
  25. commit-graph tests: fix unportable "dd" invocationJunio C Hamano, Feb 22, 2019

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.