X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-metadata%2Ftest_ust;h=f1b967505222e01bd2576546124b50d7953fd09e;hp=b7f1af1d8fd265f9666a7becf28e10c4c4f1367a;hb=03f66fb8271904c7bca9d3cfd5b3cf1d9c4e5221;hpb=eded6438f3b15eccc391525f653e03293a890d32

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index b7f1af1d8..f1b967505 100755
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -25,7 +25,6 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 
 TRACE_PATH=$(mktemp -d)
 
@@ -37,20 +36,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"
-}
-
-function lttng_create_session_uri_live
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live -U net://localhost >/dev/null 2>&1
-	ok $? "Create live session"
-}
-
 function enable_channel_per_pid()
 {
 	sess_name=$1
@@ -68,7 +53,7 @@ function test_ust_streaming ()
 	local file_sync_before_last=$(mktemp -u)
 
 	diag "Test UST streaming with metadata regeneration"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
@@ -162,7 +147,7 @@ function test_ust_live ()
 	local file_sync_before_last=$(mktemp -u)
 
 	diag "Test UST live with metadata regeneration (expect failure)"
-	lttng_create_session_uri_live $SESSION_NAME $TRACE_PATH
+	create_lttng_session_uri $SESSION_NAME net://localhost --live
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &