Tests: regression testing for notification API

[lttng-tools.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 100f4fd2a1fc02566518168a2d2cd57447d71061..567929aa08840f79e251855500b74f7584f36331 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -687,57 +687,81 @@ function create_lttng_session_no_output ()
 
 function create_lttng_session ()
 {
-       local expected_to_fail=$1
-       local sess_name=$2
-       local trace_path=$3
-       local opt=$4
+       local withtap=$1
+       local expected_to_fail=$2
+       local sess_name=$3
+       local trace_path=$4
+       local opt=$5
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path $opt > $OUTPUT_DEST
        ret=$?
-       if [[ $expected_to_fail -eq "1" ]]; then
+       if [ $expected_to_fail -eq "1" ]; then
                test "$ret" -ne "0"
-               ok $? "Create session $sess_name in $trace_path failed as expected"
+               ret=$?
+               if [ $withtap -eq "1" ]; then
+                       ok $ret "Create session $sess_name in $trace_path failed as expected"
+               fi
        else
-               ok $ret "Create session $sess_name in $trace_path"
+               if [ $withtap -eq "1" ]; then
+                       ok $ret "Create session $sess_name in $trace_path"
+               fi
        fi
+       return $ret
 }
 
 function create_lttng_session_ok ()
 {
-       create_lttng_session 0 "$@"
+       create_lttng_session 1 0 "$@"
 }
 
 function create_lttng_session_fail ()
 {
-       create_lttng_session 1 "$@"
+       create_lttng_session 1 1 "$@"
+}
+
+function create_lttng_session_notap ()
+{
+       create_lttng_session 0 0 "$@"
 }
 
 
 function enable_ust_lttng_channel ()
 {
-       local expected_to_fail=$1
-       local sess_name=$2
-       local channel_name=$3
-       local opt=$4
+       local withtap=$1
+       local expected_to_fail=$2
+       local sess_name=$3
+       local channel_name=$4
+       local opt=$5
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
        ret=$?
        if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
-               ok $? "Enable channel $channel_name for session $sess_name failed as expected"
+               ret=$?
+               if [ $withtap -eq "1" ]; then
+                       ok $ret "Enable channel $channel_name for session $sess_name failed as expected"
+               fi
        else
-               ok $ret "Enable channel $channel_name for session $sess_name"
+               if [ $withtap -eq "1" ]; then
+                       ok $ret "Enable channel $channel_name for session $sess_name"
+               fi
        fi
+       return $ret
 }
 
 function enable_ust_lttng_channel_ok ()
 {
-       enable_ust_lttng_channel 0 "$@"
+       enable_ust_lttng_channel 1 0 "$@"
 }
 
 function enable_ust_lttng_channel_fail ()
 {
-       enable_ust_lttng_channel 1 "$@"
+       enable_ust_lttng_channel 1 1 "$@"
+}
+
+function enable_ust_lttng_channel_notap ()
+{
+       enable_ust_lttng_channel 0 0 "$@"
 }
 
 function disable_ust_lttng_channel()
@@ -787,10 +811,11 @@ function enable_lttng_mmap_overwrite_ust_channel()
 
 function enable_ust_lttng_event ()
 {
-       local expected_to_fail=$1
-       local sess_name=$2
-       local event_name="$3"
-       local channel_name=$4
+       local withtap=$1
+       local expected_to_fail=$2
+       local sess_name=$3
+       local event_name="$4"
+       local channel_name=$5
 
        if [ -z $channel_name ]; then
                # default channel if none specified
@@ -803,20 +828,31 @@ function enable_ust_lttng_event ()
        ret=$?
        if [[ $expected_to_fail -eq "1" ]]; then
                test $ret -ne "0"
-               ok $? "Enable ust event $event_name for session $session_name failed as expected"
+               ret=$?
+               if [[ $withtap -eq "1" ]]; then
+                       ok $ret "Enable ust event $event_name for session $session_name failed as expected"
+               fi
        else
-               ok $ret "Enable ust event $event_name for session $sess_name"
+               if [[ $withtap -eq "1" ]]; then
+                       ok $ret "Enable ust event $event_name for session $sess_name"
+               fi
        fi
+       return $ret
 }
 
 function enable_ust_lttng_event_ok ()
 {
-       enable_ust_lttng_event 0 "$@"
+       enable_ust_lttng_event 1 0 "$@"
 }
 
 function enable_ust_lttng_event_fail ()
 {
-       enable_ust_lttng_event 1 "$@"
+       enable_ust_lttng_event 1 1 "$@"
+}
+
+function enable_ust_lttng_event_notap ()
+{
+       enable_ust_lttng_event 0 0 "$@"
 }
 
 function enable_jul_lttng_event()