Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / destructive / metadata-regeneration

diff --git a/tests/destructive/metadata-regeneration b/tests/destructive/metadata-regeneration
index 32469b5b4390e0d57cd530ab0cacbfb17a6238bb..9dedca1e0330838d6a82c3648b4b02b44c125055 100755 (executable)
--- a/tests/destructive/metadata-regeneration
+++ b/tests/destructive/metadata-regeneration
@@ -89,7 +89,7 @@ function test_kernel_local ()
        validate_trace_date $DATE1 $TRACE_PATH
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
        validate_trace_date $DATE2 $TRACE_PATH
        if [ $? -eq 0 ]; then
@@ -111,7 +111,7 @@ function test_kernel_streaming ()
        validate_trace_date $DATE1 $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
        # Validate test
        validate_trace_date $DATE2 $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
@@ -134,7 +134,9 @@ function test_ust_local ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event_ok $SESSION_NAME $UST_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
 
@@ -147,7 +149,7 @@ function test_ust_local ()
 
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -170,7 +172,9 @@ function test_ust_streaming ()
        lttng_create_session_uri
        enable_ust_lttng_event_ok $SESSION_NAME $UST_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
 
@@ -184,7 +188,7 @@ function test_ust_streaming ()
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
 
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME