Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / tools / snapshots / ust_test

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 54321817dc28fe575b5d62dedbb6278c52dd6f72..2d585fd531595920ebc02c0ba89296081f009e21 100755 (executable)
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -49,7 +49,7 @@ function start_test_app()
        local tmp_file=$(mktemp -u)
 
        # Start application with a temporary file.
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $tmp_file &
        ret=$?
        APPS_PID="${APPS_PID} ${!}"
        ok $ret "Start application to trace"
@@ -156,8 +156,6 @@ function enable_mmap_small_overwrite_ust_channel ()
 function test_ust_list_output ()
 {
        output_names=("randomname" "somesnapshot")
-       NR_ITER=2000000
-       NR_USEC_WAIT=100
 
        diag "Test UST snapshot output listing"
        create_lttng_session_no_output $SESSION_NAME
@@ -187,7 +185,7 @@ function test_ust_list_output ()
 
 function test_ust_local_snapshot ()
 {
-       NR_ITER=2000000
+       NR_ITER=-1
        NR_USEC_WAIT=100
 
        diag "Test local UST snapshots"
@@ -306,7 +304,7 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 
 function test_ust_local_snapshot_max_size ()
 {
-       NR_ITER=2000000
+       NR_ITER=-1
        NR_USEC_WAIT=100
        page_size=`getconf PAGE_SIZE`
        num_cpus=$(conf_proc_count)
@@ -359,8 +357,6 @@ function test_ust_local_snapshot_max_size ()
 
 function test_ust_local_snapshot_large_metadata ()
 {
-       NR_ITER=2000000
-       NR_USEC_WAIT=100
        LM_EVENT="tp:tptest1,tp:tptest2,tp:tptest3,tp:tptest4,tp:tptest5"
        LM_PATH="$TESTDIR/utils/testapp"
        LM_NAME="gen-ust-nevents"
@@ -388,8 +384,6 @@ function test_ust_local_snapshot_large_metadata ()
 
 function enable_channel_per_uid_mmap_overwrite()
 {
-       NR_ITER=2000000
-       NR_USEC_WAIT=100
        sess_name=$1
        channel_name=$2
 
@@ -399,6 +393,8 @@ function enable_channel_per_uid_mmap_overwrite()
 
 function test_ust_per_uid_local_snapshot ()
 {
+       NR_ITER=-1
+       NR_USEC_WAIT=100
        diag "Test per-uid local UST snapshots"
        create_lttng_session_no_output $SESSION_NAME
        enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
@@ -425,7 +421,7 @@ function test_ust_per_uid_local_snapshot ()
 
 function test_ust_per_uid_local_snapshot_post_mortem ()
 {
-       NR_ITER=2000000
+       NR_ITER=-1
        NR_USEC_WAIT=100
 
        diag "Test local UST snapshots post-mortem"
@@ -453,7 +449,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 
 function test_ust_local_snapshots ()
 {
-       NR_ITER=2000000
+       NR_ITER=-1
        NR_USEC_WAIT=100
 
        diag "Test $NR_SNAPSHOT local UST snapshots"