Refactor: test: wrapper for destroy_lttng_session

[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 61c364f68319bb480b784681d815abbbe7bc63f2..271eb139246d6595bcaf5d859c387b40fb55b6d3 100755 (executable)
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -132,7 +132,7 @@ function test_ust_list_output ()
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        snapshot_add_output $SESSION_NAME "file://$TRACE_PATH" ${output_names[0]}
 
@@ -149,8 +149,8 @@ function test_ust_list_output ()
 
        ok $? "Snapshot named ${output_names[1]} present in list-output listing"
 
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_ust_local_snapshot ()
@@ -159,15 +159,15 @@ function test_ust_local_snapshot ()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        lttng_snapshot_add_output $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 $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -193,7 +193,7 @@ function test_ust_local_snapshot_max_size ()
        enable_mmap_overwrite_subbuf_ust_channel $SESSION_NAME $CHANNEL_NAME $subbuf_size
 
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        snapshot_add_output $SESSION_NAME "file://$TRACE_PATH" "" $max_size
 
@@ -213,8 +213,8 @@ function test_ust_local_snapshot_max_size ()
 
        pass "Tracefiles size sum validation"
 
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -238,13 +238,13 @@ function test_ust_local_snapshot_large_metadata ()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
        $LM_BIN 1 1
        ok $? "Start application to trace"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $LM_EVENT $TRACE_PATH/
@@ -269,15 +269,15 @@ function test_ust_per_uid_local_snapshot ()
        create_lttng_session_no_output $SESSION_NAME
        enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        lttng_snapshot_add_output $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 $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -295,7 +295,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
        create_lttng_session_no_output $SESSION_NAME
        enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
 
        # Returns once the application has at least fired ONE tracepoint.
@@ -303,8 +303,8 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
        stop_test_apps
 
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/
@@ -320,7 +320,7 @@ function test_ust_local_snapshots ()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
 
        # Returns once the application has at least fired ONE tracepoint.
@@ -337,8 +337,8 @@ function test_ust_local_snapshots ()
                        rm -rf $TRACE_PATH
                fi
        done
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        stop_test_apps
 }