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 08a140d9e3ac76d80a3e52c324ad2a410a0a1295..5d36e65836765a4749db715be4c4dd8f4f83dc74 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=150
+NUM_TESTS=142
 
 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).
@@ -66,14 +66,6 @@ function rotate_ust_test ()
 
        destroy_lttng_session_ok $SESSION_NAME
 
-       # The tests on the chunk folder rely on the date staying the same during
-       # the duration of the test, if this fail we will now why the other checks
-       # fail afterwards. There is a short window of time where an automated test
-       # could fail because of that.
-       now=$(date +%Y%m%d)
-       test $today = $now
-       ok $? "Date did not change during the test"
-
        validate_test_chunks "${local_path}" $today $app_path ust $per_pid
 }
 
@@ -123,7 +115,7 @@ 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
 }
@@ -136,7 +128,7 @@ 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
 }
@@ -150,7 +142,7 @@ 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
 }
@@ -164,7 +156,7 @@ 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
 }