Fix: tests: support systems where PAGE_SIZE is not 4096

[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 2401794eb2b3b767d96c71dd7cf4d67c0a9f15f7..54e1d88a02eb01e43745a05b0414df1aa75ef36e 100755 (executable)
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -150,7 +150,7 @@ function test_ust_list_output ()
        ok $? "Snapshot named ${output_names[1]} present in list-output listing"
 
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_ust_local_snapshot ()
@@ -160,14 +160,14 @@ function test_ust_local_snapshot ()
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 
        # Returns once the application has at least fired ONE tracepoint.
        start_test_app
 
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -181,9 +181,12 @@ function test_ust_local_snapshot ()
 
 function test_ust_local_snapshot_max_size ()
 {
-       subbuf_size=8192
+       page_size=`getconf PAGE_SIZE`
        num_cpus=`nproc`
 
+       # The minimum subbuf size is the platform PAGE_SIZE
+       subbuf_size=$(($page_size*2))
+
        # The minimum size limit is min(subbuf_size) * nb_streams
        max_size=$(($subbuf_size*$num_cpus))
 
@@ -214,7 +217,7 @@ function test_ust_local_snapshot_max_size ()
        pass "Tracefiles size sum validation"
 
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -239,12 +242,12 @@ function test_ust_local_snapshot_large_metadata ()
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
        $LM_BIN 1 1
        ok $? "Start application to trace"
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $LM_EVENT $TRACE_PATH/
@@ -270,14 +273,14 @@ function test_ust_per_uid_local_snapshot ()
        enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 
        # Returns once the application has at least fired ONE tracepoint.
        start_test_app
 
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -296,7 +299,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
        enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 
        # Returns once the application has at least fired ONE tracepoint.
        start_test_app
@@ -304,7 +307,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -321,7 +324,7 @@ function test_ust_local_snapshots ()
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 
        # Returns once the application has at least fired ONE tracepoint.
        start_test_app
@@ -338,7 +341,7 @@ function test_ust_local_snapshots ()
                fi
        done
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        stop_test_apps
 }