Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / tools / streaming / test_ust

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index 51656e4be952444de49dbb46c1fff035b641a815..bda8ffafb57772686e5fa7281c4008485a7a6f2c 100755 (executable)
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -49,7 +49,6 @@ function lttng_create_session_uri
 
 function test_ust_before_start ()
 {
-       local file_sync_after_first=$(mktemp -u)
        local file_sync_before_last=$(mktemp -u)
 
        diag "Test UST streaming BEFORE tracing starts"
@@ -57,18 +56,17 @@ function test_ust_before_start ()
        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 &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-before-last-event ${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
-       rm -f ${file_sync_after_first}
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
        rm -f ${file_sync_before_last}
 }
 
@@ -79,17 +77,18 @@ function test_ust_after_start ()
        diag "Test UST streaming AFTER tracing starts"
        lttng_create_session_uri
        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
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} >/dev/null 2>&1
 
        while [ ! -f "${file_sync_after_first}" ]; do
                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