tests: gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / tools / relayd-grouping / test_ust

diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust
index 6c7eb98e59ebd8149ed3d2703cbc9fc19620585e..85d7197e6633e562d52e9139d8d3eb212aff87cc 100755 (executable)
--- a/tests/regression/tools/relayd-grouping/test_ust
+++ b/tests/regression/tools/relayd-grouping/test_ust
@@ -87,7 +87,7 @@ function test_ust_uid_live ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"
@@ -126,7 +126,7 @@ function test_ust_pid_live ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"
@@ -166,7 +166,7 @@ function test_ust_uid_live_custom_output ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"
@@ -205,7 +205,7 @@ function test_ust_uid_streaming ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"
@@ -244,7 +244,7 @@ function test_ust_pid_streaming ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"
@@ -284,7 +284,7 @@ function test_ust_uid_streaming_custom_output ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"
@@ -323,7 +323,7 @@ function test_ust_uid_streaming_rotate ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
        rotate_session_ok "$session_name"
 
        stop_lttng_tracing_ok "$session_name"
@@ -364,7 +364,7 @@ function test_ust_uid_streaming_rotate_custom_output ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
        rotate_session_ok "$session_name"
 
 
@@ -405,7 +405,7 @@ function test_ust_pid_streaming_rotate ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
        rotate_session_ok "$session_name"
 
        stop_lttng_tracing_ok "$session_name"
@@ -445,7 +445,7 @@ function test_ust_uid_streaming_snapshot ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
        lttng_snapshot_record "$session_name"
 
        stop_lttng_tracing_ok "$session_name"
@@ -491,7 +491,9 @@ function test_ust_pid_streaming_snapshot ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_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" 2>&1 &
 
        while [ ! -f "${file_sync_after_first}" ]; do
                sleep 0.5
@@ -542,7 +544,7 @@ function test_ust_uid_streaming_snapshot_add_output_default_name ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        lttng_snapshot_add_output_ok "$session_name" "net://localhost"
        lttng_snapshot_record "$session_name"
@@ -585,7 +587,7 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        lttng_snapshot_add_output_ok "$session_name" "net://localhost" "-n $snapshot_name"
        lttng_snapshot_record "$session_name"
@@ -631,7 +633,7 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name_custom_output ()
        enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
        lttng_snapshot_add_output_ok "$session_name" "net://localhost/$custom_output" "-n $snapshot_name"
        lttng_snapshot_record "$session_name"