Fix tests: snapshot size validation failure runs too many test cases

[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 287ee24bf0dc258e94f1f73e3c71476be4632771..7540be2d490f1074ff4a74204295e7004560c04d 100755 (executable)
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -19,7 +19,6 @@ TEST_DESC="Snapshots - UST tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="snapchan"
 TESTAPP_PATH="$TESTDIR/utils/testapp"
@@ -157,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
@@ -188,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"
@@ -307,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)
@@ -340,10 +337,10 @@ function test_ust_local_snapshot_max_size ()
        if [ "$sum_size_tracefiles" -gt "$max_size" ]; then
                fail "Tracefiles size sum validation"
                diag "Tracefiles size sum: $sum_size_tracefiles Expected max: $max_size"
+       else
+               pass "Tracefiles size sum validation"
        fi
 
-       pass "Tracefiles size sum validation"
-
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
 
@@ -360,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"
@@ -389,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
 
@@ -400,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
@@ -426,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"
@@ -454,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"