From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: luke@diamand.org, sunshine@sunshineco.com,
Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v1 1/2] git-p4: kill p4d watchdog on cleanup
Date: Sun, 20 Dec 2015 17:44:28 +0100 [thread overview]
Message-ID: <1450629869-49522-2-git-send-email-larsxschneider@gmail.com> (raw)
In-Reply-To: <1450629869-49522-1-git-send-email-larsxschneider@gmail.com>
From: Lars Schneider <larsxschneider@gmail.com>
If failing tests are executed with the "immediate" flag then "kill_p4d"
is not called and consequently the watchdog process, which is supposed
to detect a hanging p4d, is not killed. Kill the watchdog always in the
"on exit" cleanup trap.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
t/lib-git-p4.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index f9ae1d7..30bf7ae 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -76,6 +76,7 @@ pidfile="$TRASH_DIRECTORY/p4d.pid"
# Sometimes "prove" seems to hang on exit because p4d is still running
cleanup() {
+ kill -9 $watchdog_pid 2>/dev/null
if test -f "$pidfile"
then
kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
--
2.5.1
next prev parent reply other threads:[~2015-12-20 16:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-20 16:44 [PATCH v1 0/2] git-p4: kill watchdog and suppress irrelevant output larsxschneider
2015-12-20 16:44 ` larsxschneider [this message]
2015-12-20 16:44 ` [PATCH v1 2/2] git-p4: suppress non test relevant output larsxschneider
2015-12-21 20:38 ` Junio C Hamano
2015-12-22 8:47 ` Lars Schneider
2015-12-24 11:09 ` Luke Diamand
2015-12-21 20:31 ` [PATCH v1 0/2] git-p4: kill watchdog and suppress irrelevant output Junio C Hamano
2015-12-22 9:12 ` Lars Schneider
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450629869-49522-2-git-send-email-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).