From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/4] t/lib-git-p4: silence output when killing p4d and its watchdog
Date: Tue, 2 Jun 2026 12:20:23 +0200 [thread overview]
Message-ID: <ah6uZ6tdIh38X2uZ@pks.im> (raw)
In-Reply-To: <xmqqecipxp6g.fsf@gitster.g>
On Tue, Jun 02, 2026 at 06:32:55PM +0900, Junio C Hamano wrote:
> 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
next prev parent reply other threads:[~2026-06-02 10:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 8:54 [PATCH 0/4] t: fix broken TAP output Patrick Steinhardt
2026-06-02 8:54 ` [PATCH 1/4] t7527: " Patrick Steinhardt
2026-06-02 8:54 ` [PATCH 2/4] t/test-lib: silence EBUSY errors on Windows during test cleanup Patrick Steinhardt
2026-06-02 8:54 ` [PATCH 3/4] t/lib-git-p4: silence output when killing p4d and its watchdog Patrick Steinhardt
2026-06-02 9:32 ` Junio C Hamano
2026-06-02 10:20 ` Patrick Steinhardt [this message]
2026-06-02 13:16 ` Junio C Hamano
2026-06-02 8:54 ` [PATCH 4/4] t: let prove fail when parsing invalid TAP output Patrick Steinhardt
2026-06-03 5:39 ` [PATCH v2 0/4] t: fix broken " Patrick Steinhardt
2026-06-03 5:39 ` [PATCH v2 1/4] t7527: " Patrick Steinhardt
2026-06-03 5:39 ` [PATCH v2 2/4] t/test-lib: silence EBUSY errors on Windows during test cleanup Patrick Steinhardt
2026-06-03 5:39 ` [PATCH v2 3/4] t/lib-git-p4: silence output when killing p4d and its watchdog Patrick Steinhardt
2026-06-03 5:39 ` [PATCH v2 4/4] t: let prove fail when parsing invalid TAP output Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ah6uZ6tdIh38X2uZ@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox