X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftools%2Fstreaming%2Frun-ust;h=28b72f8245cceb27a5d34f961f7c4ae579509409;hb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f;hp=1c415cc70b44eb2f1436c6b7ce55f47b52b375b5;hpb=c38b5107fcb9435ea7584e82f6c61319a9391fc0;p=lttng-tools.git

diff --git a/tests/tools/streaming/run-ust b/tests/tools/streaming/run-ust
index 1c415cc70..28b72f824 100755
--- a/tests/tools/streaming/run-ust
+++ b/tests/tools/streaming/run-ust
@@ -34,16 +34,10 @@ if [ ! -x "$CURDIR/$BIN_NAME" ]; then
 	exit 0
 fi
 
-function lttng_create_session
+function lttng_create_session_uri
 {
 	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME >/dev/null 2>&1
-}
-
-function lttng_enable_consumer
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-consumer -u net://localhost >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
 }
 
 function wait_apps
@@ -61,38 +55,36 @@ function wait_apps
 function test_ust_before_start ()
 {
 	echo -e "\n=== Testing UST streaming BEFORE tracing starts\n"
-	lttng_create_session
-	lttng_enable_consumer
+	lttng_create_session_uri
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
 
 	# Run 5 times with a 1 second delay
 	./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
 
-	start_tracing $SESSION_NAME
+	start_lttng_tracing $SESSION_NAME
 
 	wait_apps
-	stop_tracing $SESSION_NAME
+	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 }
 
 function test_ust_after_start ()
 {
 	echo -e "\n=== Testing UST streaming AFTER tracing starts\n"
-	lttng_create_session
-	lttng_enable_consumer
+	lttng_create_session_uri
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-	start_tracing $SESSION_NAME
+	start_lttng_tracing $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
 
 	wait_apps
-	stop_tracing $SESSION_NAME
+	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 }
 
-start_sessiond
-lttng_start_relayd "-o $TRACE_PATH"
+start_lttng_sessiond
+start_lttng_relayd "-o $TRACE_PATH"
 
 tests=( test_ust_before_start test_ust_after_start )
 
@@ -112,7 +104,7 @@ do
 done
 
 echo ""
-stop_sessiond
-lttng_stop_relayd
+stop_lttng_sessiond
+stop_lttng_relayd
 
 exit $out