Refactor: test: wrapper for start_lttng_tracing

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/kernel/test_all_events b/tests/regression/kernel/test_all_events
index 63be154705b693dfcf59e17a08599987415d93e0..444f0853e1ab80a3b32fd5604bb84155764b9adc 100755 (executable)
--- a/tests/regression/kernel/test_all_events
+++ b/tests/regression/kernel/test_all_events
@@ -32,7 +32,7 @@ function test_all_event()
 
        lttng_enable_kernel_event $SESSION_NAME
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        stop_lttng_tracing
 
        validate_trace "sched_switch" $TRACE_PATH

diff --git a/tests/regression/kernel/test_event_basic b/tests/regression/kernel/test_event_basic
index 2906ec71ebddcf1b75e14564895fba8d23086459..3c5f91d0f18c22ac717d0376c7f83cd3e0eca799 100755 (executable)
--- a/tests/regression/kernel/test_event_basic
+++ b/tests/regression/kernel/test_event_basic
@@ -34,7 +34,7 @@ function test_event_basic()
        lttng_enable_kernel_event $SESSION_NAME "sched_process_exit"
        lttng_enable_kernel_event $SESSION_NAME "sched_process_free"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        stop_lttng_tracing
 
        validate_trace "sched_switch" $TRACE_PATH
@@ -55,7 +55,7 @@ function test_enable_after_start()
 
        lttng_enable_kernel_event $SESSION_NAME "sched_switch"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        lttng_enable_kernel_event $SESSION_NAME "sched_process_exit"
        stop_lttng_tracing
 

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 9fe599a1595e0b14ffa2fdfb20ba6efef4cf1453..fd1593d9d6d1751774d3c32c161f1891a898aedc 100755 (executable)
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -65,7 +65,7 @@ function test_syscall_simple_list()
 
        validate_list $SESSION_NAME $EVENT_NAME
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        eval ${TESTCMD}
        stop_lttng_tracing
 
@@ -98,7 +98,7 @@ function test_syscall_simple_list_two()
        validate_list $SESSION_NAME $EVENT_NAME
        validate_list $SESSION_NAME $EVENT_NAME2
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        eval ${TESTCMD}
        stop_lttng_tracing
 
@@ -129,7 +129,7 @@ function test_syscall_single()
 
        lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        eval ${TESTCMD}
        stop_lttng_tracing
 
@@ -157,7 +157,7 @@ function test_syscall_two()
        lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
        lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        eval ${TESTCMD}
        stop_lttng_tracing
 
@@ -187,7 +187,7 @@ function test_syscall_all()
        # enable all syscalls
        lttng_enable_kernel_syscall_ok $SESSION_NAME
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        eval ${TESTCMD}
        stop_lttng_tracing
 
@@ -218,7 +218,7 @@ function test_syscall_all_disable_one()
        # "all syscalls" is not "the open" system call.
        lttng_disable_kernel_syscall_fail $SESSION_NAME "open"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        eval ${TESTCMD}
        stop_lttng_tracing
 
@@ -250,7 +250,7 @@ function test_syscall_all_disable_two()
        lttng_disable_kernel_syscall_fail $SESSION_NAME "open"
        lttng_disable_kernel_syscall_fail $SESSION_NAME "close"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        # generates open, close, execve (at least)
        eval ${TESTCMD}
        stop_lttng_tracing
@@ -285,7 +285,7 @@ function test_syscall_enable_all_disable_all()
        # disable all system calls
        lttng_disable_kernel_syscall_ok $SESSION_NAME
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        # generates open, close, execve (at least)
        eval ${TESTCMD}
        stop_lttng_tracing
@@ -314,7 +314,7 @@ function test_syscall_enable_all_disable_all_enable_all()
        # enable all system calls
        lttng_enable_kernel_syscall_ok $SESSION_NAME
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        # generates open, close, execve (at least)
        eval ${TESTCMD}
        stop_lttng_tracing
@@ -349,7 +349,7 @@ function test_syscall_enable_all_disable_all_twice()
        # disable all system calls
        lttng_disable_kernel_syscall_ok $SESSION_NAME
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        # generates open, close, execve (at least)
        eval ${TESTCMD}
        stop_lttng_tracing
@@ -376,7 +376,7 @@ function test_syscall_enable_one_disable_one()
        # disable open system call
        lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        # generates open, close, execve (at least)
        eval ${TESTCMD}
        stop_lttng_tracing
@@ -405,7 +405,7 @@ function test_syscall_enable_two_disable_two()
        lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
        lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        # generates open, close, execve (at least)
        eval ${TESTCMD}
        stop_lttng_tracing
@@ -433,7 +433,7 @@ function test_syscall_enable_two_disable_one()
        # disable close system call
        lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        # generates open, close, execve (at least)
        eval ${TESTCMD}
        stop_lttng_tracing

diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion
index 94f5251ba58f9d25b0aaec6779378e71e1e0a97d..6ff8c210f7b00be2fee868e72ddfb15b55d445b2 100755 (executable)
--- a/tests/regression/tools/exclusion/test_exclusion
+++ b/tests/regression/tools/exclusion/test_exclusion
@@ -57,7 +57,7 @@ function test_exclusion
        enable_ust_lttng_all_event_exclusion $SESSION_NAME $EV_EXCLUDE_NAME
 
        # Trace apps
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        run_apps
        stop_lttng_tracing $SESSION_NAME
 

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index b2254b3e61f5242b61151b80a5a561a7bab01d20..9a9e31c83aaea4b64f6e8e9ad18e660a1f40e1d4 100755 (executable)
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -65,7 +65,7 @@ function test_valid_filter
        enable_ust_lttng_event_filter $SESSION_NAME $EVENT_NAME $filter
 
        # Trace apps
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        run_apps
        stop_lttng_tracing $SESSION_NAME
 

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index 5010a9136b7ee94ec7cc13e9bf07f68826676b25..ade4b0e9c5c211e425655366324aae1dc8d3a32e 100644 (file)
--- a/tests/regression/tools/health/test_health.sh
+++ b/tests/regression/tools/health/test_health.sh
@@ -111,7 +111,7 @@ function test_health
                        diag "With kernel consumer daemon"
                        lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
                }
-               start_lttng_tracing $SESSION_NAME
+               start_lttng_tracing_ok $SESSION_NAME
        fi
 
        if [ ${test_relayd} -eq 1 ]; then

diff --git a/tests/regression/tools/health/test_thread_ok b/tests/regression/tools/health/test_thread_ok
index 62be3bac32196ee86cab909a11f49e12f89c10ca..5efe49fe1528653dedb3d9cee45448052ddf3bc1 100755 (executable)
--- a/tests/regression/tools/health/test_thread_ok
+++ b/tests/regression/tools/health/test_thread_ok
@@ -80,7 +80,7 @@ function test_thread_ok
        diag "With UST consumer daemons"
        create_lttng_session_no_output $SESSION_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Check health status
@@ -92,7 +92,7 @@ function test_thread_ok
                diag "With kernel consumer daemon"
                create_lttng_session_no_output $SESSION_NAME
                lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
-               start_lttng_tracing $SESSION_NAME
+               start_lttng_tracing_ok $SESSION_NAME
                destroy_lttng_session $SESSION_NAME
 
                # Check health status

diff --git a/tests/regression/tools/live/test_lttng_kernel b/tests/regression/tools/live/test_lttng_kernel
index f4d7d419f2ef0dffbd674abc462ff3866221ba56..d55eab61f7440f6c1f6eb6751609ccbc513379c1 100755 (executable)
--- a/tests/regression/tools/live/test_lttng_kernel
+++ b/tests/regression/tools/live/test_lttng_kernel
@@ -49,7 +49,7 @@ function setup_live_tracing()
        ok $? "Create session in live mode with delay $DELAY_USEC"
 
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 }
 
 function clean_live_tracing()

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index 177b1f76ac98ed2cff325ec0127baa795340ec43..b1d5c293103236b657be6091fde10acfb97829ae 100755 (executable)
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_ust
@@ -63,7 +63,7 @@ function setup_live_tracing()
        ok $? "Create session in live mode with delay $DELAY_USEC"
 
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 }
 
 function clean_live_tracing()

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index 3f5f4b5f5ce87051cb90778fef3d88522c74b132..4c71fd8308604912c703bd864cb8c042c87cfb5d 100755 (executable)
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -545,7 +545,7 @@ function test_start_stop () {
        #Test fail command
        #No channel enable start command should return element success false
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-       start_lttng_tracing $session_name 1
+       start_lttng_tracing_fail $session_name
        $XML_VALIDATE $OUTPUT_DEST
        ok $? "Mi test: failed start xsd validation"
 
@@ -560,7 +560,7 @@ function test_start_stop () {
 
        #Start tracing
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-       start_lttng_tracing $session_name
+       start_lttng_tracing_ok $session_name
        $XML_VALIDATE $OUTPUT_DEST
        ok $? "Mi test: start xsd validation"
 

diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel
index a12f0b8a8cc1f54b25a26edd47ec9aac9dc45fd2..61e5a7c0ecddb7dba91e8ecdc2e0844e074fb518 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -41,7 +41,7 @@ function test_kernel_local_snapshot ()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $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
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing $SESSION_NAME
@@ -63,7 +63,7 @@ function test_kernel_local_snapshot_after_stop ()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        stop_lttng_tracing $SESSION_NAME
        lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
        lttng_snapshot_record $SESSION_NAME
@@ -88,7 +88,7 @@ function test_kernel_local_snapshot_append_to_metadata ()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT1 $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
 
        # first snapshot with only 1 event
@@ -126,7 +126,7 @@ function test_kernel_1000_local_snapshots ()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $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
        for i in $(seq 1 $NB_SNAP); do
                diag "Snapshot $i/$NB_SNAP"

diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
index f28adaa1eed930571ef1695605d55104f001bcc3..233285743479ed564951ba910687ce64c35dd854 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel_streaming
+++ b/tests/regression/tools/snapshots/test_kernel_streaming
@@ -57,7 +57,7 @@ function test_kernel_default_name_with_del()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
 
@@ -90,7 +90,7 @@ function test_kernel_default_name()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing $SESSION_NAME
@@ -112,7 +112,7 @@ function test_kernel_custom_name()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        snapshot_add_output $SESSION_NAME "net://localhost" $name
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing $SESSION_NAME

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index 3041715ff082a202879c1a269e7f6a2bae4c5989..4dcac4a16a6c8c25aa77218a3afcf30f7c296e0a 100755 (executable)
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -92,7 +92,7 @@ function test_ust_default_name_with_del()
        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
 
        start_test_app
 
@@ -133,7 +133,7 @@ function test_ust_default_name()
        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
 
        start_test_app
 
@@ -156,7 +156,7 @@ function test_ust_default_name_custom_uri()
        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
 
        start_test_app
 
@@ -183,7 +183,7 @@ function test_ust_custom_name()
        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
 
        start_test_app
 

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 61c364f68319bb480b784681d815abbbe7bc63f2..815a7f2b496b33722dea28a12c71eb258ce88886 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]}
 
@@ -159,7 +159,7 @@ 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.
@@ -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
 
@@ -238,7 +238,7 @@ 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"
@@ -269,7 +269,7 @@ 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.
@@ -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.
@@ -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.

diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits
index f2bf7426c07f31bc0960600f0e1a205eb4d06dcd..4a91524860cc994e80cfff5a1215cfc37f1ac3d3 100755 (executable)
--- a/tests/regression/tools/streaming/test_high_throughput_limits
+++ b/tests/regression/tools/streaming/test_high_throughput_limits
@@ -100,7 +100,7 @@ function test_high_throughput
        NETWORK_URI="net://localhost"
        create_lttng_session_with_uri $SESSION_NAME $NETWORK_URI
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        run_apps
        diag "Waiting for applications to end"
        wait

diff --git a/tests/regression/tools/streaming/test_kernel b/tests/regression/tools/streaming/test_kernel
index 1e272c39aa92f0f48cd074b7b7637736e90c549a..5718201b8bec515e13c46741dc009554b4b74b72 100755 (executable)
--- a/tests/regression/tools/streaming/test_kernel
+++ b/tests/regression/tools/streaming/test_kernel
@@ -47,7 +47,7 @@ function test_kernel_before_start ()
        diag "Test kernel streaming with event enable BEFORE start"
        lttng_create_session_uri
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        # Give a second
        sleep 1
        stop_lttng_tracing $SESSION_NAME
@@ -60,7 +60,7 @@ function test_kernel_after_start ()
 {
        diag "Test kernel streaming with event enable AFTER start"
        lttng_create_session_uri
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
        # Give a second
        sleep 1

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index 51656e4be952444de49dbb46c1fff035b641a815..68d92947c1051f55cb66cda4edf98575e4a254ce 100755 (executable)
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -59,7 +59,7 @@ function test_ust_before_start ()
        # Run 5 times with a 1 second delay
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        touch ${file_sync_before_last}
 
@@ -79,7 +79,7 @@ function test_ust_after_start ()
        diag "Test UST streaming AFTER tracing starts"
        lttng_create_session_uri
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_count b/tests/regression/tools/tracefile-limits/test_tracefile_count
index 8dfcbad739a3b7fe4c33a6f6e38cd868dc4b2c9d..91e2136c984c95659db1b768105fa38f7aef5f7f 100755 (executable)
--- a/tests/regression/tools/tracefile-limits/test_tracefile_count
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_count
@@ -116,7 +116,7 @@ function test_tracefile_count_limit ()
        enable_ust_lttng_event_per_channel \
            $session_name $event_name $channel_name
 
-       start_lttng_tracing $session_name
+       start_lttng_tracing_ok $session_name
 
        $TESTAPP_BIN $num_iter >/dev/null 2>&1
 

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
index 1583c9519a74357349d022f5dbd285c58ba231e8..9fa772eb27a93e392ad1da1c60894d1f2373fbed 100755 (executable)
--- a/tests/regression/tools/tracefile-limits/test_tracefile_size
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
@@ -108,7 +108,7 @@ function test_tracefile_size_limit ()
        enable_ust_lttng_event_per_channel \
            $session_name $event_name $channel_name
 
-       start_lttng_tracing $session_name
+       start_lttng_tracing_ok $session_name
 
        $TESTAPP_BIN $NR_ITER >/dev/null 2>&1
 

diff --git a/tests/regression/ust/before-after/test_before_after b/tests/regression/ust/before-after/test_before_after
index 12c5e30bc848cf1b19c7810a979ca084c18210ab..1ab94a7240c1647f80f65ec2edcaede02e8e316c 100755 (executable)
--- a/tests/regression/ust/before-after/test_before_after
+++ b/tests/regression/ust/before-after/test_before_after
@@ -40,7 +40,7 @@ function test_before_apps()
        # BEFORE application is spawned
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
        wait
@@ -66,7 +66,7 @@ function test_after_apps()
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} &
        ok $? "Application started in background."
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        touch ${file_sync_before_last}
 

diff --git a/tests/regression/ust/buffers-pid/test_buffers_pid b/tests/regression/ust/buffers-pid/test_buffers_pid
index dd5b367b13645ff5180fa48f0dfada654dcf3c0e..d21e8c34ad6f256bc8c927a97aa80442917ad862 100755 (executable)
--- a/tests/regression/ust/buffers-pid/test_buffers_pid
+++ b/tests/regression/ust/buffers-pid/test_buffers_pid
@@ -55,7 +55,7 @@ test_after_multiple_apps() {
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        for i in `seq 1 5`; do
                $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 &
@@ -88,7 +88,7 @@ test_before_multiple_apps() {
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        for i in `seq 1 5`; do
                touch ${file_sync_before_last}_${i}
@@ -129,7 +129,7 @@ test_after_app() {
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
        ok $? "Start application to trace"
@@ -159,7 +159,7 @@ test_before_app() {
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} &
        ok $? "Start application to trace"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        touch ${file_sync_before_last}
 
@@ -208,7 +208,7 @@ test_multiple_channels() {
        ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel3"
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel4 -s $SESSION_NAME -u >/dev/null 2>&1
        ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
        ok $? "Start application to trace"

diff --git a/tests/regression/ust/high-throughput/test_high_throughput b/tests/regression/ust/high-throughput/test_high_throughput
index 41ae6118cc33dfec3cd681e5413fe9a9f65bf7fe..c236e5aaf00ce127ef1c5535752bb643cfa37a82 100755 (executable)
--- a/tests/regression/ust/high-throughput/test_high_throughput
+++ b/tests/regression/ust/high-throughput/test_high_throughput
@@ -43,7 +43,7 @@ start_lttng_sessiond
 create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-start_lttng_tracing $SESSION_NAME
+start_lttng_tracing_ok $SESSION_NAME
 
 for i in `seq 1 $NR_APP`; do
        ./$CURDIR/$BIN_NAME >/dev/null 2>&1 &

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index 4835e3dcd6885eae79c020329fa85c7134293e9c..03b6e2da913ca31eca435c922db8dd9b1c50c857 100755 (executable)
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -100,7 +100,7 @@ function test_jul_before_start ()
        # Run 5 times with a 1 second delay
        run_app_background
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        touch ${file_sync_before_last}
 
@@ -126,7 +126,7 @@ function test_jul_after_start ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -147,7 +147,7 @@ function test_jul_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -165,7 +165,7 @@ function test_jul_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_SEVERE"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -183,7 +183,7 @@ function test_jul_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINER"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -203,7 +203,7 @@ function test_jul_loglevel_multiple ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
        enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINEST"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -220,7 +220,7 @@ function test_jul_loglevel_multiple ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_INFO"
        enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_FINEST"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -241,11 +241,11 @@ function test_jul_multi_session_loglevel()
 
        create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_jul_loglevel_only $SESSION_NAME-1 '*' "JUL_INFO"
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_jul_loglevel_only $SESSION_NAME-2 '*' "JUL_FINEST"
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 1 1
@@ -276,11 +276,11 @@ function test_jul_multi_session_disable()
        enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
        enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME2
        disable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -315,8 +315,8 @@ function test_jul_multi_session_disable_wildcard()
 
        disable_jul_lttng_event $SESSION_NAME-1 '*'
 
-       start_lttng_tracing $SESSION_NAME-1
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        run_app
 
@@ -349,7 +349,7 @@ function test_jul_disable_all()
 
        disable_jul_lttng_event $SESSION_NAME '*'
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_app 0 1
 
@@ -370,11 +370,11 @@ function test_jul_multi_session()
 
        create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -403,7 +403,7 @@ function test_jul_destroy_session()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/first-sess
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app_background 0 1
@@ -422,7 +422,7 @@ function test_jul_destroy_session()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/second-sess
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app_background 0 1
@@ -447,7 +447,7 @@ function test_jul_filtering()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable all event with a filter.
        enable_jul_filter $SESSION_NAME '*' 'msg == "JUL second logger fired"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -465,7 +465,7 @@ function test_jul_filtering()
        # Enable first Logger but filter msg payload for the INFO one while
        # triggering the finest and second TP.
        enable_jul_filter $SESSION_NAME $EVENT_NAME 'msg == "JUL tp fired!"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay, fire finest and second TP.
        run_app 1 1
@@ -489,7 +489,7 @@ function test_jul_disable()
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
        disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -513,7 +513,7 @@ function test_jul_disable_enable()
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
        disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -541,7 +541,7 @@ function test_jul_filter_loglevel()
        enable_jul_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" JUL_CONFIG
        disable_jul_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
        enable_jul_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" JUL_CONFIG
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1

diff --git a/tests/regression/ust/java-log4j/test_java_log4j b/tests/regression/ust/java-log4j/test_java_log4j
index 77df00a792b37ef489940eacfca97ef0e09973ba..6abc12fe301e4325caa908c87fc902ba91af99d9 100755 (executable)
--- a/tests/regression/ust/java-log4j/test_java_log4j
+++ b/tests/regression/ust/java-log4j/test_java_log4j
@@ -101,7 +101,7 @@ function test_log4j_before_start ()
        # Run 5 times with a 1 second delay
        run_app_background
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        touch ${file_sync_before_last}
 
@@ -127,7 +127,7 @@ function test_log4j_after_start ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -148,7 +148,7 @@ function test_log4j_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_INFO"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -166,7 +166,7 @@ function test_log4j_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_FATAL"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -184,7 +184,7 @@ function test_log4j_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_TRACE"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -204,7 +204,7 @@ function test_log4j_loglevel_multiple ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_INFO"
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -221,7 +221,7 @@ function test_log4j_loglevel_multiple ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME '*' "LOG4J_INFO"
        enable_log4j_lttng_event_loglevel $SESSION_NAME '*' "LOG4J_DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -242,11 +242,11 @@ function test_log4j_multi_session_loglevel()
 
        create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_log4j_loglevel_only $SESSION_NAME-1 '*' "LOG4J_INFO"
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_log4j_loglevel_only $SESSION_NAME-2 '*' "LOG4J_DEBUG"
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 1 1
@@ -277,11 +277,11 @@ function test_log4j_multi_session_disable()
        enable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME
        enable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME2
        disable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_log4j_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -316,8 +316,8 @@ function test_log4j_multi_session_disable_wildcard()
 
        disable_log4j_lttng_event $SESSION_NAME-1 '*'
 
-       start_lttng_tracing $SESSION_NAME-1
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        run_app
 
@@ -350,7 +350,7 @@ function test_log4j_disable_all()
 
        disable_log4j_lttng_event $SESSION_NAME '*'
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_app 0 1
 
@@ -371,11 +371,11 @@ function test_log4j_multi_session()
 
        create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_log4j_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -404,7 +404,7 @@ function test_log4j_destroy_session()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/first-sess
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app_background 0 1
@@ -422,7 +422,7 @@ function test_log4j_destroy_session()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/second-sess
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app_background 0 1
@@ -446,7 +446,7 @@ function test_log4j_filtering()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable all event with a filter.
        enable_log4j_filter $SESSION_NAME '*' 'msg == "LOG4J second logger fired"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -464,7 +464,7 @@ function test_log4j_filtering()
        # Enable first Logger but filter msg payload for the INFO one while
        # triggering the debug and second TP.
        enable_log4j_filter $SESSION_NAME $EVENT_NAME 'msg == "LOG4J tp fired!"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay, fire debug and second TP.
        run_app 1 1
@@ -488,7 +488,7 @@ function test_log4j_disable()
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
        disable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -512,7 +512,7 @@ function test_log4j_disable_enable()
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        disable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -540,7 +540,7 @@ function test_log4j_filter_loglevel()
        enable_log4j_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" LOG4J_INFO
        disable_log4j_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
        enable_log4j_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" LOG4J_INFO
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1

diff --git a/tests/regression/ust/low-throughput/test_low_throughput b/tests/regression/ust/low-throughput/test_low_throughput
index 53299489dd47d17e164d008761a7513c9dde1687..e98c06725af1e5f5d19b377c9febcb7ad972858a 100755 (executable)
--- a/tests/regression/ust/low-throughput/test_low_throughput
+++ b/tests/regression/ust/low-throughput/test_low_throughput
@@ -42,7 +42,7 @@ start_lttng_sessiond
 create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-start_lttng_tracing $SESSION_NAME
+start_lttng_tracing_ok $SESSION_NAME
 
 # This is going to take 20 minutes
 ./$CURDIR/$BIN_NAME >/dev/null 2>&1

diff --git a/tests/regression/ust/multi-session/test_multi_session b/tests/regression/ust/multi-session/test_multi_session
index c2b7b946b6c56601e920bfe3278449105afbe11a..4fcb54777a97c7f577ed19084eec73d4066cb842 100755 (executable)
--- a/tests/regression/ust/multi-session/test_multi_session
+++ b/tests/regression/ust/multi-session/test_multi_session
@@ -38,7 +38,7 @@ test_multi_session() {
        for i in `seq 0 3`; do
                create_lttng_session_ok "$SESSION_NAME-$i" "$TRACE_PATH/$i"
                enable_ust_lttng_event_ok "$SESSION_NAME-$i" "$EVENT_NAME$i"
-               start_lttng_tracing "$SESSION_NAME-$i"
+               start_lttng_tracing_ok "$SESSION_NAME-$i"
        done
 
        ./$CURDIR/gen-nevents $NR_ITER &

diff --git a/tests/regression/ust/nprocesses/test_nprocesses b/tests/regression/ust/nprocesses/test_nprocesses
index e5e27226ce91104e92009d3525388638a863786e..02fd0d0324f00dfd3b86fd30f5c0c4d357878e6b 100755 (executable)
--- a/tests/regression/ust/nprocesses/test_nprocesses
+++ b/tests/regression/ust/nprocesses/test_nprocesses
@@ -71,7 +71,7 @@ TRACE_PATH=$(mktemp -d)
 create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-start_lttng_tracing $SESSION_NAME
+start_lttng_tracing_ok $SESSION_NAME
 
 touch ${file_sync_before_last}
 

diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap
index ab853f31ae7b4927ccfa488bcab1ff9c6283d4ab..f85a0ccc0551f2e61a08929e1af15b5bea4060c1 100755 (executable)
--- a/tests/regression/ust/overlap/test_overlap
+++ b/tests/regression/ust/overlap/test_overlap
@@ -87,7 +87,7 @@ test_enable_simple_wildcard()
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -109,7 +109,7 @@ test_enable_wildcard_filter()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -130,7 +130,7 @@ test_enable_wildcard_filter_2()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -151,7 +151,7 @@ test_enable_wildcard_filter_3()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -172,7 +172,7 @@ test_enable_wildcard_filter_4()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -193,7 +193,7 @@ test_enable_wildcard_filter_5()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -214,7 +214,7 @@ test_enable_wildcard_filter_6()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -238,7 +238,7 @@ test_enable_wildcard_filter_7()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -259,7 +259,7 @@ test_enable_wildcard_filter_8()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -280,7 +280,7 @@ test_enable_same_wildcard_filter()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -308,7 +308,7 @@ test_enable_same_wildcard_filter_2()
            fail "Enable event $event_name with filtering for session $sess_name twice failure NOT detected"
        fi
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -329,7 +329,7 @@ test_enable_same_wildcard_filter_3()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -350,7 +350,7 @@ test_enable_same_wildcard_filter_4()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0&&1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -371,7 +371,7 @@ test_enable_same_event_filter()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -397,7 +397,7 @@ test_disable_same_wildcard_filter()
 
        disable_ust_lttng_event $SESSION_NAME "ust*"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -421,7 +421,7 @@ test_enable_bad_wildcard()
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild3"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -442,7 +442,7 @@ test_enable_simple_wildcard_2()
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -463,7 +463,7 @@ test_enable_loglevel_overlap()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -484,7 +484,7 @@ test_enable_loglevel_only_overlap()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
        enable_ust_lttng_event_loglevel_only $SESSION_NAME "$event_wild2" "TRACE_CRIT"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -505,7 +505,7 @@ test_enable_loglevel_overlap_2()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -526,7 +526,7 @@ test_enable_same_wildcard_loglevels()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -547,7 +547,7 @@ test_enable_same_event_loglevels()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -574,7 +574,7 @@ test_disable_simple_wildcard()
        disable_ust_lttng_event $SESSION_NAME "$event_wild1"
        disable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
@@ -598,7 +598,7 @@ test_disable_wildcard_overlap()
 
        disable_ust_lttng_event $SESSION_NAME "$event_wild1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 

diff --git a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
index e8f695fedf5c1b155ac56ecf38a56652b9e5aeb2..90f5c4dd9b2e30b93c44314aeb01c8514e2f4a94 100755 (executable)
--- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@ -138,7 +138,7 @@ test_after_app_pid() {
        enable_metadata_per_pid $SESSION_NAME
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Start application after tracing
        start_check_trace_app
@@ -184,7 +184,7 @@ test_before_app_pid() {
        enable_metadata_per_pid $SESSION_NAME
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        check_app_tmp_file
        # Let the application at least perform a flush!
@@ -227,7 +227,7 @@ test_after_app_uid() {
        enable_metadata_per_uid $SESSION_NAME
        enable_channel_per_uid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Start application after tracing
        start_check_trace_app
@@ -273,7 +273,7 @@ test_before_app_uid() {
        enable_metadata_per_uid $SESSION_NAME
        enable_channel_per_uid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        check_app_tmp_file
        # Let the application at least perform a flush!

diff --git a/tests/regression/ust/python-logging/test_python_logging b/tests/regression/ust/python-logging/test_python_logging
index 610e8a642baacf172b55ea9b274329d63749017b..91e0c00c2adca715ddf1b944977bea7e3dddc938 100755 (executable)
--- a/tests/regression/ust/python-logging/test_python_logging
+++ b/tests/regression/ust/python-logging/test_python_logging
@@ -96,7 +96,7 @@ function test_python_before_start ()
        # Run 5 times with a 1 second delay
        run_app_background
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Wait for the applications started in background
        wait
@@ -117,7 +117,7 @@ function test_python_after_start ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -138,7 +138,7 @@ function test_python_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "INFO"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -156,7 +156,7 @@ function test_python_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "CRITICAL"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -174,7 +174,7 @@ function test_python_loglevel ()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -194,7 +194,7 @@ function test_python_loglevel_multiple ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "INFO"
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -211,7 +211,7 @@ function test_python_loglevel_multiple ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME '*' "INFO"
        enable_python_lttng_event_loglevel $SESSION_NAME '*' "DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -232,11 +232,11 @@ function test_python_multi_session_loglevel()
 
        create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_python_loglevel_only $SESSION_NAME-1 '*' "INFO"
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_python_loglevel_only $SESSION_NAME-2 '*' "DEBUG"
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 1 1
@@ -271,11 +271,11 @@ function test_python_multi_session_disable()
        enable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME
        enable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME2
        disable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_python_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -310,8 +310,8 @@ function test_python_multi_session_disable_wildcard()
 
        disable_python_lttng_event $SESSION_NAME-1 '*'
 
-       start_lttng_tracing $SESSION_NAME-1
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        run_app
 
@@ -344,7 +344,7 @@ function test_python_disable_all()
 
        disable_python_lttng_event $SESSION_NAME '*'
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_app 0 1
 
@@ -365,11 +365,11 @@ function test_python_multi_session()
 
        create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
        create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_python_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -398,7 +398,7 @@ function test_python_destroy_session()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/first-sess
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app_background 0 1
@@ -417,7 +417,7 @@ function test_python_destroy_session()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/second-sess
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app_background 0 1
@@ -442,7 +442,7 @@ function test_python_filtering()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable all event with a filter.
        enable_python_filter $SESSION_NAME '*' 'msg == "python-ev-test2 fired"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -460,7 +460,7 @@ function test_python_filtering()
        # Enable first Logger but filter msg payload for the INFO one while
        # triggering the debug and second TP.
        enable_python_filter $SESSION_NAME $EVENT_NAME 'msg == "python-ev-test1 fired"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay, fire debug and second TP.
        run_app 1 1
@@ -484,7 +484,7 @@ function test_python_disable()
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME2
        disable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -508,7 +508,7 @@ function test_python_disable_enable()
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
        disable_python_lttng_event $SESSION_NAME $EVENT_NAME
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -536,7 +536,7 @@ function test_python_filter_loglevel()
        enable_python_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" "INFO"
        disable_python_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
        enable_python_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" "INFO"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1

diff --git a/tests/regression/ust/test_event_basic b/tests/regression/ust/test_event_basic
index 90be0e972e0d7f2cec81669237528071da1084d9..59089fd5aa557fddb3886fccae698fef31978d9a 100755 (executable)
--- a/tests/regression/ust/test_event_basic
+++ b/tests/regression/ust/test_event_basic
@@ -90,10 +90,10 @@ function test_event_basic()
        enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME $CHAN_NAME
        enable_ust_lttng_event_per_chan $SESSION_NAME2 $EVENT_NAME3 $CHAN_NAME2
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        stop_lttng_tracing
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        stop_lttng_tracing
 
        TODO="Validate trace output is coherent"

diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf
index 478ffb4e6f34e96b16889eb1eb7799eb273ae2d7..84e56d31df7b48896bff109bbfc0b7bc4b8bd007 100755 (executable)
--- a/tests/regression/ust/test_event_perf
+++ b/tests/regression/ust/test_event_perf
@@ -66,7 +66,7 @@ function test_event_basic()
 
        add_ust_lttng_context $SESSION_NAME $CHAN_NAME "perf:thread:page-fault"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
 
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
 

diff --git a/tests/regression/ust/test_event_tracef b/tests/regression/ust/test_event_tracef
index b63ee218c27a3d6a1e920d531fc9e5099ceda9b6..1577445e4ee2496e14fb27bb082baddaac7d53da 100755 (executable)
--- a/tests/regression/ust/test_event_tracef
+++ b/tests/regression/ust/test_event_tracef
@@ -39,7 +39,7 @@ function test_event_tracef()
 {
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
        ok $? "Traced application stopped."

diff --git a/tests/regression/ust/test_event_wildcard b/tests/regression/ust/test_event_wildcard
index 29aceff26926fa0431656230e1a306564acc3820..f50e5df87e3f921592bbac5aba16a4687f6dc2c9 100755 (executable)
--- a/tests/regression/ust/test_event_wildcard
+++ b/tests/regression/ust/test_event_wildcard
@@ -42,7 +42,7 @@ function test_event_wildcard()
        enable_ust_lttng_event_ok $SESSION_NAME "$EVENT_NAME"
        enable_ust_lttng_event_ok $SESSION_NAME "$EVENT_NAME2"
 
-       start_lttng_tracing
+       start_lttng_tracing_ok
        stop_lttng_tracing
 
        TODO="Validate trace output is coherent"

diff --git a/tests/stress/test_multi_sessions_per_uid_10app b/tests/stress/test_multi_sessions_per_uid_10app
index 91950be0e071903cf72177005f97a29c3c52e41d..5d41fa517c7b55cd41cddf5a58e0e0583fd62240 100755 (executable)
--- a/tests/stress/test_multi_sessions_per_uid_10app
+++ b/tests/stress/test_multi_sessions_per_uid_10app
@@ -84,7 +84,7 @@ test_stress()
                        check_sessiond
                        enable_ust_lttng_event_ok $SESSION_NAME-$a $EVENT_NAME
                        check_sessiond
-                       start_lttng_tracing $SESSION_NAME-$a
+                       start_lttng_tracing_ok $SESSION_NAME-$a
                        check_sessiond
                done
 

diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming b/tests/stress/test_multi_sessions_per_uid_5app_streaming
index ec6d9af293fe5d51a63c8f04695bd64818a994cd..817621ab295c61d7bc84f9288b3a1c7524430e4e 100755 (executable)
--- a/tests/stress/test_multi_sessions_per_uid_5app_streaming
+++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming
@@ -120,7 +120,7 @@ test_stress()
                        enable_ust_lttng_event_ok $SESSION_NAME-$a $EVENT_NAME
                        check_sessiond
                        check_relayd
-                       start_lttng_tracing $SESSION_NAME-$a
+                       start_lttng_tracing_ok $SESSION_NAME-$a
                        check_sessiond
                        check_relayd
                done

diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
index c3fdeb13da933a0144cd9098640733eb2157c55c..1b1cf56bdca9684d8adc77eff93151b23c07c4eb 100755 (executable)
--- a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
+++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
@@ -122,7 +122,7 @@ test_stress()
                        enable_ust_lttng_event_ok $SESSION_NAME-$a $EVENT_NAME
                        check_sessiond
                        check_relayd
-                       start_lttng_tracing $SESSION_NAME-$a
+                       start_lttng_tracing_ok $SESSION_NAME-$a
                        check_sessiond
                        check_relayd
                done

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index a8e0e4a0721926a9b183487b634d4b6812dae1c0..f9df77bb0ec69050a5608c447e19ef03b44b041f 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -661,12 +661,12 @@ function disable_python_lttng_event ()
 
 function start_lttng_tracing ()
 {
-       local sess_name=$1
-       local expected_to_fail=$2
+       local expected_to_fail=$1
+       local sess_name=$2
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
        ret=$?
-       if [[ $expected_to_fail ]]; then
+       if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
                ok $? "Expected fail on start tracing for session: $sess_name"
        else
@@ -674,6 +674,16 @@ function start_lttng_tracing ()
        fi
 }
 
+function start_lttng_tracing_ok ()
+{
+       start_lttng_tracing 0 "$@"
+}
+
+function start_lttng_tracing_fail ()
+{
+       start_lttng_tracing 1 "$@"
+}
+
 function stop_lttng_tracing ()
 {
        local sess_name=$1