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

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

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 69bc18e1c5864a29729c3fe5a8d4b973e832571a..d5ded6703f9e057feaacd21657d0eda28c8b4807 100755 (executable)
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -27,7 +27,7 @@ EVENT_NAME="tp:tptest"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=142
+NUM_TESTS=136
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -55,10 +55,10 @@ function rotate_ust_test ()
        start_lttng_tracing_ok $SESSION_NAME
        today=$(date +%Y%m%d)
 
-       $TESTAPP_BIN 10 $NR_USEC_WAIT /dev/null 2>&1
+       $TESTAPP_BIN -i 10 -w $NR_USEC_WAIT > /dev/null 2>&1
        rotate_session_ok $SESSION_NAME
 
-       $TESTAPP_BIN 20 $NR_USEC_WAIT /dev/null 2>&1
+       $TESTAPP_BIN -i 20 -w $NR_USEC_WAIT > /dev/null 2>&1
        stop_lttng_tracing_ok $SESSION_NAME
 
        # Third chunk contains no event (rotate after stop).
@@ -75,7 +75,7 @@ function test_ust_streaming_uid ()
        create_lttng_session_uri $SESSION_NAME net://localhost
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
-       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
+       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/uid/*/*/" 0
 }
 
 function test_ust_local_uid ()
@@ -84,7 +84,7 @@ function test_ust_local_uid ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
-       rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
+       rotate_ust_test "${TRACE_PATH}/archives" "ust/uid/*/*/" 0
 }
 
 function test_ust_streaming_pid ()
@@ -94,7 +94,7 @@ function test_ust_streaming_pid ()
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
-       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/pid/*/" 1
+       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/pid/*/" 1
 }
 
 function test_ust_local_pid ()
@@ -104,7 +104,7 @@ function test_ust_local_pid ()
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
-       rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
+       rotate_ust_test "${TRACE_PATH}/archives" "ust/pid/*/" 1
 }
 
 function test_ust_local_timer_uid ()
@@ -115,9 +115,9 @@ function test_ust_local_timer_uid ()
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        start_lttng_tracing_ok $SESSION_NAME
        # We just want the app to register, no event generated
-       $TESTAPP_BIN 0 0 /dev/null 2>&1
+       $TESTAPP_BIN -i 0 -w 0 > /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}" 0
+       rotate_timer_test "${TRACE_PATH}/archives" 0
 }
 
 function test_ust_streaming_timer_uid ()
@@ -128,9 +128,9 @@ function test_ust_streaming_timer_uid ()
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        start_lttng_tracing_ok $SESSION_NAME
        # We just want the app to register, no event generated
-       $TESTAPP_BIN 0 0 /dev/null 2>&1
+       $TESTAPP_BIN -i 0 -w 0 > /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
+       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 0
 }
 
 function test_ust_local_timer_pid ()
@@ -142,9 +142,9 @@ function test_ust_local_timer_pid ()
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        start_lttng_tracing_ok $SESSION_NAME
        # We just want the app to register, no event generated
-       $TESTAPP_BIN 0 0 /dev/null 2>&1
+       $TESTAPP_BIN -i 0 -w 0 > /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}" 1
+       rotate_timer_test "${TRACE_PATH}/archives" 1
 }
 
 function test_ust_streaming_timer_pid ()
@@ -156,9 +156,9 @@ function test_ust_streaming_timer_pid ()
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        start_lttng_tracing_ok $SESSION_NAME
        # We just want the app to register, no event generated
-       $TESTAPP_BIN 0 0 /dev/null 2>&1
+       $TESTAPP_BIN -i 0 -w 0 > /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
+       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 1
 }
 
 function test_incompatible_sessions ()