Tests: consolidate session creation with a uri parameter in utils.sh

[lttng-tools.git] / tests / regression / tools / regen-metadata / test_ust

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index b7f1af1d8fd265f9666a7becf28e10c4c4f1367a..bba2d8700541590f849f074650f24cc51c4b9142 100755 (executable)
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -37,20 +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"
-}
-
-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 +54,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 +148,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 &