Gen-ust-events: use options instead of arguments

[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..ddd77262fe8a3b4fa892a547018cda1dc357e1b9 100755 (executable)
--- 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,10 +53,12 @@ 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 &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} \
+               --sync-before-last-event ${file_sync_before_last} >/dev/null 2>&1 &
 
        start_lttng_tracing_ok $SESSION_NAME
 
@@ -102,7 +89,9 @@ function test_ust_local ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        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 &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} \
+               --sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
 
        start_lttng_tracing_ok $SESSION_NAME
 
@@ -134,7 +123,9 @@ function test_ust_pid ()
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} \
+               --sync-before-last-event ${file_sync_before_last} >/dev/null 2>&1 &
 
        start_lttng_tracing_ok $SESSION_NAME
 
@@ -162,10 +153,12 @@ 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 &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} \
+               --sync-before-last-event ${file_sync_before_last} >/dev/null 2>&1 &
 
        start_lttng_tracing_ok $SESSION_NAME