From 5be9e97c3516075de5bd387816d849c50e39e5f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 22 Apr 2021 12:32:26 -0400 Subject: [PATCH] Fix: tests: health thread stall: only stop consumerd when required MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since a0f8e3109, stop_lttng_consumerd will report a failure when there is no consumer daemon to kill. This fix ensures it is only invoked for tests that launch a consumer daemon. Signed-off-by: Jérémie Galarneau Change-Id: Ifba6c0a87158d5cf20eeacb2b65fe049197d9b55 --- tests/regression/tools/health/test_health.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh index 27571d05f..f7b0f4c2b 100644 --- a/tests/regression/tools/health/test_health.sh +++ b/tests/regression/tools/health/test_health.sh @@ -19,7 +19,7 @@ UST_EVENT_NAME="tp:tptest" KERNEL_EVENT_NAME="sched_switch" CHANNEL_NAME="testchan" HEALTH_CHECK_BIN="health_check" -NUM_TESTS=106 +NUM_TESTS=99 SLEEP_TIME=30 source $TESTDIR/utils/utils.sh @@ -137,7 +137,10 @@ function test_health # it may have been killed volountarily by testpoint. stop_lttng_relayd_notap $KILL_SIGNAL fi - stop_lttng_consumerd $KILL_SIGNAL + + if [ ${test_consumerd} -eq 1 ]; then + stop_lttng_consumerd $KILL_SIGNAL + fi stop_lttng_sessiond $KILL_SIGNAL unset LTTNG_TESTPOINT_ENABLE -- 2.34.1