Tests: add notap versions of start/stop tracing helpers

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/tools/crash/test_crash b/tests/regression/tools/crash/test_crash
index 5b9a27c58abce165e85cc4a8150f07cf2d93d4fe..3bf459dc2cb097ce8f5708c4a010a86ae5c14638 100755 (executable)
--- a/tests/regression/tools/crash/test_crash
+++ b/tests/regression/tools/crash/test_crash
@@ -229,7 +229,7 @@ function test_lttng_crash()
 
        # Generate 10 events
        $TESTAPP_BIN 10 0
-       stop_lttng_tracing
+       stop_lttng_tracing_ok
 
        crash_recup_count=$($LTTNG_CRASH $shm_path | wc -l)
        test $crash_recup_count -eq "10"
@@ -267,7 +267,7 @@ function test_lttng_crash_extraction()
        start_lttng_tracing_ok $session_name
        # Generate 10 events
        $TESTAPP_BIN 10 0
-       stop_lttng_tracing
+       stop_lttng_tracing_ok
 
        $LTTNG_CRASH -x $extraction_path $shm_path
        ok $? "Extraction of crashed buffers to path"

diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
index eca9688cfea3653f355d241f3bdaea645729b8be..7465a83f813fa7bdc8d34cb6bfaab745d44d897a 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -265,7 +265,7 @@ function test_multi_app ()
                        resume_consumerd "${pipe}"
                done
                # Stop tracing forcing full buffer consumption
-               stop_lttng_tracing $SESSION_NAME
+               stop_lttng_tracing_ok $SESSION_NAME
 
                # Check for notifications reception
                wait_for_message $output_dir "${low_output_file_pattern}" "notification: low $i"

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 2d53a7237350e6df4b5492ab2930c0d2f6f391a9..2343b4b28d3e872437072fee95bb00601c300fd2 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1081,54 +1081,76 @@ function disable_python_lttng_event ()
        ok $? "Disable Python event $event_name for session $sess_name"
 }
 
-function start_lttng_tracing ()
+function start_lttng_tracing_opt ()
 {
-       local expected_to_fail=$1
-       local sess_name=$2
+       local withtap=$1
+       local expected_to_fail=$2
+       local sess_name=$3
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
        ret=$?
        if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
-               ok $? "Start tracing for session $sess_name failed as expected"
+               ret=$?
+               if [ $withtap -eq "1" ]; then
+                       ok $? "Start tracing for session $sess_name failed as expected"
+               fi
        else
-               ok $ret "Start tracing for session $sess_name"
+               if [ $withtap -eq "1" ]; then
+                       ok $ret "Start tracing for session $sess_name"
+               fi
        fi
 }
 
 function start_lttng_tracing_ok ()
 {
-       start_lttng_tracing 0 "$@"
+       start_lttng_tracing_opt 1 0 "$@"
 }
 
 function start_lttng_tracing_fail ()
 {
-       start_lttng_tracing 1 "$@"
+       start_lttng_tracing_opt 1 1 "$@"
 }
 
-function stop_lttng_tracing ()
+function start_lttng_tracing_notap ()
 {
-       local expected_to_fail=$1
-       local sess_name=$2
+       start_lttng_tracing_opt 0 1 "$@"
+}
+
+function stop_lttng_tracing_opt ()
+{
+       local withtap=$1
+       local expected_to_fail=$2
+       local sess_name=$3
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
        ret=$?
        if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
-               ok $? "Stop lttng tracing for session $sess_name failed as expected"
+               ret=$?
+               if [ $withtap -eq "1" ]; then
+                       ok $? "Stop lttng tracing for session $sess_name failed as expected"
+               fi
        else
-               ok $ret "Stop lttng tracing for session $sess_name"
+               if [ $withtap -eq "1" ]; then
+                       ok $ret "Stop lttng tracing for session $sess_name"
+               fi
        fi
 }
 
 function stop_lttng_tracing_ok ()
 {
-       stop_lttng_tracing 0 "$@"
+       stop_lttng_tracing_opt 1 0 "$@"
 }
 
 function stop_lttng_tracing_fail ()
 {
-       stop_lttng_tracing 1 "$@"
+       stop_lttng_tracing_opt 1 1 "$@"
+}
+
+function stop_lttng_tracing_notap ()
+{
+       stop_lttng_tracing_opt 0 0 "$@"
 }
 
 function destroy_lttng_session ()