From 06904a8d96c8ddc9fe22d0b3e36dd5ecc0c245a7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 20 Feb 2017 17:44:09 +0000 Subject: [PATCH] tests: Consistently don't try to kill pid 0 daemon_pid will still be 0 if any tests were skipped. In particular this happens during `make installcheck`. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99825 Reviewed-by: Philip Withnall Signed-off-by: Simon McVittie --- test/dbus-daemon-eavesdrop.c | 8 ++++++-- test/monitor.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/test/dbus-daemon-eavesdrop.c b/test/dbus-daemon-eavesdrop.c index be51f6a..d2c0872 100644 --- a/test/dbus-daemon-eavesdrop.c +++ b/test/dbus-daemon-eavesdrop.c @@ -407,8 +407,12 @@ teardown (Fixture *f, f->eavesdropper = NULL; } - test_kill_pid (f->daemon_pid); - g_spawn_close_pid (f->daemon_pid); + if (f->daemon_pid != 0) + { + test_kill_pid (f->daemon_pid); + g_spawn_close_pid (f->daemon_pid); + f->daemon_pid = 0; + } test_main_context_unref (f->ctx); } diff --git a/test/monitor.c b/test/monitor.c index 9446294..0402d4a 100644 --- a/test/monitor.c +++ b/test/monitor.c @@ -1769,8 +1769,12 @@ teardown (Fixture *f, f->activated = NULL; } - test_kill_pid (f->daemon_pid); - g_spawn_close_pid (f->daemon_pid); + if (f->daemon_pid != 0) + { + test_kill_pid (f->daemon_pid); + g_spawn_close_pid (f->daemon_pid); + f->daemon_pid = 0; + } test_main_context_unref (f->ctx); -- 2.7.4