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

Re: [PATCH 3/4] t/lib-git-p4: silence output when killing p4d and its watchdog

From
Patrick Steinhardt <ps@pks.im>
Date
Jun 2, 2026, 10:20 UTC
Message-ID
<ah6uZ6tdIh38X2uZ@pks.im>
In-Reply-To
<xmqqecipxp6g.fsf@gitster.g>
On Tue, Jun 02, 2026 at 06:32:55PM +0900, Junio C Hamano wrote:
Show 19 quoted lines
> Patrick Steinhardt <ps@pks.im> writes:
> 
> >  stop_p4d_and_watchdog () {
> >  	kill -9 $p4d_pid $watchdog_pid
> > +	wait $p4d $watchdog_pid 2>/dev/null
> >  }
> 
> Shoudln't we be waiting on $p4d_pid (not $p4d)...
> 
> > @@ -175,7 +176,7 @@ retry_until_success () {
> >  
> >  stop_and_cleanup_p4d () {
> >  	kill -9 $p4d_pid $watchdog_pid
> > -	wait $p4d_pid
> > +	wait $p4d_pid $watchdog_pid 2>/dev/null
> >  	rm -rf "$db" "$cli" "$pidfile"
> >  }
> 
> ... like we do here?

Oh, good catch. The statement basically doesn't do anything, which isn't much of a problem because we really only care about silencing the error message when the watchdog is being terminated. Will fix.

Patrick
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 18 in “t: fix broken TAP output”
  1. 0/4 t: fix broken TAP outputPatrick Steinhardt, Jun 2, 2026
  2. 1/4 t7527: fix broken TAP outputPatrick Steinhardt, Jun 2, 2026
  3. 2/4 t/test-lib: silence EBUSY errors on Windows during test cleanupPatrick Steinhardt, Jun 2, 2026
  4. 3/4 t/lib-git-p4: silence output when killing p4d and its watchdogPatrick Steinhardt, Jun 2, 2026
  5. Junio C HamanoJun 2, 2026
  6. Patrick SteinhardtJun 2, 2026
  7. Junio C HamanoJun 2, 2026
  8. 4/4 t: let prove fail when parsing invalid TAP outputPatrick Steinhardt, Jun 2, 2026
  9. 0/8 t: fix broken TAP outputPatrick Steinhardt, Jun 4, 2026
  10. 1/8 gitlab-ci: rearrange Linux jobs to match GitHub's orderPatrick Steinhardt, Jun 4, 2026
  11. 2/8 gitlab-ci: add missing Linux jobsPatrick Steinhardt, Jun 4, 2026
  12. 3/8 ci: unify Linux images across GitLab and GitHubPatrick Steinhardt, Jun 4, 2026
  13. 4/8 t7527: fix broken TAP outputPatrick Steinhardt, Jun 4, 2026
  14. 5/8 t7810: turn MB_REGEX check into a lazy prereqPatrick Steinhardt, Jun 4, 2026
  15. Jeff KingJun 9, 2026
  16. 6/8 t/test-lib: silence EBUSY errors on Windows during test cleanupPatrick Steinhardt, Jun 4, 2026
  17. 7/8 t/lib-git-p4: silence output when killing p4d and its watchdogPatrick Steinhardt, Jun 4, 2026
  18. 8/8 t: let prove fail when parsing invalid TAP outputPatrick Steinhardt, Jun 4, 2026

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.