X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_health.sh;h=f7b0f4c2b0599e8bc473efb5249e62a153e22afd;hb=5be9e97c3516075de5bd387816d849c50e39e5f1;hp=40d2f9e9cfb798381c0a7ac9e7be9bed00b46035;hpb=05aa48da927bdd0ae848f2c704c0a3389480d982;p=lttng-tools.git

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index 40d2f9e9c..f7b0f4c2b 100644
--- a/tests/regression/tools/health/test_health.sh
+++ b/tests/regression/tools/health/test_health.sh
@@ -15,28 +15,15 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 TESTDIR=${CURDIR}/../../..
-LTTNG_BIN="lttng"
 UST_EVENT_NAME="tp:tptest"
 KERNEL_EVENT_NAME="sched_switch"
 CHANNEL_NAME="testchan"
 HEALTH_CHECK_BIN="health_check"
-NUM_TESTS=90
+NUM_TESTS=99
 SLEEP_TIME=30
 
 source $TESTDIR/utils/utils.sh
 
-if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
-	BAIL_OUT "${CURDIR}/${SESSIOND_PRELOAD} is missing."
-fi
-
-function lttng_create_session_uri
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME \
-		-U net://localhost >/dev/null 2>&1
-	ok $? "Create session with default path"
-}
-
 function report_errors
 {
 	test_thread_error_string="$1"
@@ -148,9 +135,13 @@ function test_health
 	if [ ${test_relayd} -eq 1 ]; then
 		# We may fail to stop relayd here, and this is OK, since
 		# it may have been killed volountarily by testpoint.
-		stop_lttng_relayd_notap
+		stop_lttng_relayd_notap $KILL_SIGNAL
+	fi
+
+	if [ ${test_consumerd} -eq 1 ]; then
+		stop_lttng_consumerd $KILL_SIGNAL
 	fi
-	stop_lttng_sessiond
+	stop_lttng_sessiond $KILL_SIGNAL
 
 	unset LTTNG_TESTPOINT_ENABLE
 	unset ${test_thread_name}_${test_suffix}
@@ -163,6 +154,14 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+if [ -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
+	foundobj=1
+else
+	foundobj=0
+fi
+
+skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0
+
 THREAD=("LTTNG_SESSIOND_THREAD_MANAGE_CLIENTS"
 	"LTTNG_SESSIOND_THREAD_MANAGE_APPS"
 	"LTTNG_SESSIOND_THREAD_REG_APPS"