Refactor: test: wrapper for stop_lttng_tracing

[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 cbc205828149a268bdec70121eb7486dee1e2719..2401794eb2b3b767d96c71dd7cf4d67c0a9f15f7 100755 (executable)
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -130,9 +130,9 @@ function test_ust_list_output ()
        diag "Test UST snapshot output listing"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_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,7 +149,7 @@ function test_ust_list_output ()
 
        ok $? "Snapshot named ${output_names[1]} present in list-output listing"
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 }
 
@@ -158,15 +158,15 @@ function test_ust_local_snapshot ()
        diag "Test local UST snapshots"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_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
 
        # Returns once the application has at least fired ONE tracepoint.
        start_test_app
 
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test
@@ -174,8 +174,6 @@ function test_ust_local_snapshot ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 
        stop_test_apps
@@ -194,8 +192,8 @@ function test_ust_local_snapshot_max_size ()
 
        enable_mmap_overwrite_subbuf_ust_channel $SESSION_NAME $CHANNEL_NAME $subbuf_size
 
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        snapshot_add_output $SESSION_NAME "file://$TRACE_PATH" "" $max_size
 
@@ -215,7 +213,7 @@ function test_ust_local_snapshot_max_size ()
 
        pass "Tracefiles size sum validation"
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test
@@ -239,13 +237,13 @@ function test_ust_local_snapshot_large_metadata ()
        diag "Test local UST snapshots with > 4kB metadata"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $LM_EVENT $CHANNEL_NAME
-       start_lttng_tracing $SESSION_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
        $LM_BIN 1 1
        ok $? "Start application to trace"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test
@@ -253,8 +251,6 @@ function test_ust_local_snapshot_large_metadata ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 }
 
@@ -272,15 +268,15 @@ function test_ust_per_uid_local_snapshot ()
        diag "Test local UST snapshots"
        create_lttng_session_no_output $SESSION_NAME
        enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_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
 
        # Returns once the application has at least fired ONE tracepoint.
        start_test_app
 
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test
@@ -288,8 +284,6 @@ function test_ust_per_uid_local_snapshot ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 
        stop_test_apps
@@ -300,8 +294,8 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
        diag "Test local UST snapshots post-mortem"
        create_lttng_session_no_output $SESSION_NAME
        enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_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
 
        # Returns once the application has at least fired ONE tracepoint.
@@ -309,7 +303,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
        stop_test_apps
 
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test
@@ -317,8 +311,6 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 }
 
@@ -327,8 +319,8 @@ function test_ust_local_snapshots ()
        diag "Test $NR_SNAPSHOT local UST snapshots"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_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
 
        # Returns once the application has at least fired ONE tracepoint.
@@ -343,11 +335,9 @@ function test_ust_local_snapshots ()
                if [ $? -eq 0 ]; then
                        # Only delete if successful
                        rm -rf $TRACE_PATH
-               else
-                       break
                fi
        done
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        stop_test_apps