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

diff --git a/tests/tools/streaming/run-ust b/tests/tools/streaming/run-ust
index 277807faa..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,8 +55,7 @@ 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
@@ -78,8 +71,7 @@ function test_ust_before_start ()
 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_lttng_tracing $SESSION_NAME