X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_thread_ok;h=e81d6ed24b1ec1dde410907dd7dcafd2c40283d7;hb=a94427a1766d450e1f1ec60cd98e2b722645d2e3;hp=59b3f57647b90e3f6e0c77ec863dc0faf2cafee9;hpb=de3f672bfce2f25c93b62f7c11f64ae27030c2ed;p=lttng-tools.git

diff --git a/tests/regression/tools/health/test_thread_ok b/tests/regression/tools/health/test_thread_ok
index 59b3f5764..e81d6ed24 100755
--- a/tests/regression/tools/health/test_thread_ok
+++ b/tests/regression/tools/health/test_thread_ok
@@ -20,7 +20,6 @@ TEST_DESC="Health check - Thread OK"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-LTTNG_BIN="lttng"
 SESSION_NAME="health_thread_ok"
 UST_EVENT_NAME="tp:tptest"
 KERNEL_EVENT_NAME="sched_switch"
@@ -79,9 +78,9 @@ function test_thread_ok
 
 	diag "With UST consumer daemons"
 	create_lttng_session_no_output $SESSION_NAME
-	enable_ust_lttng_event $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Check health status
 	$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
@@ -92,8 +91,8 @@ function test_thread_ok
 		diag "With kernel consumer daemon"
 		create_lttng_session_no_output $SESSION_NAME
 		lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
-		start_lttng_tracing $SESSION_NAME
-		destroy_lttng_session $SESSION_NAME
+		start_lttng_tracing_ok $SESSION_NAME
+		destroy_lttng_session_ok $SESSION_NAME
 
 		# Check health status
 		$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
@@ -110,7 +109,7 @@ function test_thread_ok
 	report_errors
 
 	# Wait
-	diag "Check after running for 30 seconds"
+	diag "Check after running for ${SLEEP_TIME} seconds"
 	sleep ${SLEEP_TIME}
 
 	# Check health status