X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_ust;h=3d43ee1b4567a477ebefd2c8a044faebf863930b;hb=f0d43d3d8e0c7fcb01ba1550466517d047fd6e76;hp=51656e4be952444de49dbb46c1fff035b641a815;hpb=c4926bb5e18ba7916ff2a5d2c70ed6b099643e73;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index 51656e4be..3d43ee1b4 100755
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -37,14 +37,6 @@ if [ ! -x "$TESTAPP_BIN" ]; then
 	BAIL_OUT "No UST events binary detected."
 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"
-}
-
-
 # MUST set TESTDIR before calling those functions
 
 function test_ust_before_start ()
@@ -53,21 +45,21 @@ function test_ust_before_start ()
 	local file_sync_before_last=$(mktemp -u)
 
 	diag "Test UST streaming BEFORE tracing starts"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	# Run 5 times with a 1 second delay
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	touch ${file_sync_before_last}
 
 	# Wait for the applications started in background
 	wait
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 	rm -f ${file_sync_after_first}
 	rm -f ${file_sync_before_last}
 }
@@ -77,9 +69,9 @@ function test_ust_after_start ()
 	local file_sync_after_first=$(mktemp -u)
 
 	diag "Test UST streaming AFTER tracing starts"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1
@@ -88,8 +80,8 @@ function test_ust_after_start ()
 		sleep 0.5
 	done
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Wait for the applications started in background
 	wait