Refactor: test: wrapper for destroy_lttng_session
[lttng-tools.git] / tests / utils / utils.sh
index f73b1764c7c32750f3e8a44fd44edcfe4f9bb69b..454627eaae3ad6115b598f3067d1f81410899631 100644 (file)
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 SESSIOND_BIN="lttng-sessiond"
+CONSUMERD_BIN="lttng-consumerd"
 RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
+OUTPUT_DEST=/dev/null 2>&1
 
 # Minimal kernel version supported for session daemon tests
 KERNEL_MAJOR_VERSION=2
 KERNEL_MINOR_VERSION=6
 KERNEL_PATCHLEVEL_VERSION=27
 
+# We set the default UST register timeout to "wait forever", so that
+# basic tests don't have to worry about hitting timeouts on busy
+# systems. Specialized tests should test those corner-cases.
+export LTTNG_UST_REGISTER_TIMEOUT=-1
+
 source $TESTDIR/utils/tap/tap.sh
 
 function print_ok ()
@@ -49,13 +56,13 @@ function print_fail ()
 
 function print_test_banner ()
 {
-       desc="$1"
+       local desc="$1"
        diag "$desc"
 }
 
 function validate_kernel_version ()
 {
-       kern_version=($(uname -r | awk -F. '{ printf("%d.%d.%d\n",$1,$2,$3); }' | tr '.' '\n'))
+       local kern_version=($(uname -r | awk -F. '{ printf("%d.%d.%d\n",$1,$2,$3); }' | tr '.' '\n'))
        if [ ${kern_version[0]} -gt $KERNEL_MAJOR_VERSION ]; then
                return 0
        fi
@@ -80,9 +87,9 @@ function randstring()
 
 function lttng_enable_kernel_event
 {
-       sess_name=$1
-       event_name=$2
-       channel_name=$3
+       local sess_name=$1
+       local event_name=$2
+       local channel_name=$3
 
        if [ -z $event_name ]; then
                # Enable all event if no event name specified
@@ -96,10 +103,141 @@ function lttng_enable_kernel_event
                chan="-c $channel_name"
        fi
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k >$OUTPUT_DEST
        ok $? "Enable kernel event $event_name for session $sess_name"
 }
 
+function lttng_enable_kernel_syscall()
+{
+       local expected_to_fail=$1
+       local sess_name=$2
+       local syscall_name=$3
+       local channel_name=$4
+
+       if [ -z $syscall_name ]; then
+               # Enable all event if no syscall name specified
+               syscall_name="-a"
+       fi
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test $ret -ne "0"
+               ok $? "Enable kernel syscall $syscall_name for session $sess_name on channel $channel_name fail as expected"
+       else
+               ok $ret "Enable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
+       fi
+}
+
+function lttng_enable_kernel_syscall_ok()
+{
+       lttng_enable_kernel_syscall 0 ${*}
+}
+
+function lttng_enable_kernel_syscall_fail()
+{
+       lttng_enable_kernel_syscall 1 ${*}
+}
+
+function lttng_disable_kernel_syscall()
+{
+       local expected_to_fail=$1
+       local sess_name=$2
+       local syscall_name=$3
+       local channel_name=$4
+
+       if [ -z $syscall_name ]; then
+               # Enable all event if no syscall name specified
+               syscall_name="-a"
+       fi
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
+
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test $ret -ne "0"
+               ok $? "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name fail as expected"
+       else
+               ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
+       fi
+}
+
+function lttng_disable_kernel_syscall_ok()
+{
+       lttng_disable_kernel_syscall 0 ${*}
+}
+
+function lttng_disable_kernel_syscall_fail()
+{
+       lttng_disable_kernel_syscall 1 ${*}
+}
+
+function lttng_enable_kernel_channel()
+{
+       local expected_to_fail=$1
+       local sess_name=$2
+       local channel_name=$3
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expected failure on kernel channel creation $channel_name in $sess_name"
+       else
+               ok $ret "Enable channel $channel_name for session $sess_name"
+       fi
+}
+
+function lttng_enable_kernel_channel_ok()
+{
+       lttng_enable_kernel_channel 0 ${*}
+}
+
+function lttng_enable_kernel_channel_fail()
+{
+       lttng_enable_kernel_channel 1 ${*}
+}
+
+function lttng_disable_kernel_channel()
+{
+       local expected_to_fail=$1
+       local sess_name=$2
+       local channel_name=$3
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expected failure on kernel channel creation $channel_name in $sess_name"
+       else
+               ok $ret "disable channel $channel_name for session $sess_name"
+       fi
+}
+
+function lttng_disable_kernel_channel_ok()
+{
+       lttng_disable_kernel_channel 0 ${*}
+}
+
+function lttng_disable_kernel_channel_fail()
+{
+       lttng_disable_kernel_channel 1 ${*}
+}
+
 function start_lttng_relayd
 {
        local opt=$1
@@ -107,7 +245,7 @@ function start_lttng_relayd
        DIR=$(readlink -f $TESTDIR)
 
        if [ -z $(pidof lt-$RELAYD_BIN) ]; then
-               $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1 &
+               $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt >$OUTPUT_DEST
                #$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
                if [ $? -eq 1 ]; then
                        fail "Start lttng-relayd (opt: $opt)"
@@ -120,28 +258,42 @@ function start_lttng_relayd
        fi
 }
 
-function stop_lttng_relayd
+function stop_lttng_relayd_nocheck
 {
        PID_RELAYD=`pidof lt-$RELAYD_BIN`
 
-       kill $PID_RELAYD >/dev/null 2>&1
+       diag "Killing lttng-relayd (pid: $PID_RELAYD)"
+       kill $PID_RELAYD >$OUTPUT_DEST
+       retval=$?
 
-       if [ $? -eq 1 ]; then
-               fail "Kill lttng-relayd (pid: $PID_RELAYD)"
-               return 1
-       else
+       if [ $retval -eq 1 ]; then
                out=1
                while [ -n "$out" ]; do
                        out=$(pidof lt-$RELAYD_BIN)
                        sleep 0.5
                done
-               pass "Kill lttng-relayd (pid: $PID_RELAYD)"
+       fi
+       return $retval
+}
+
+function stop_lttng_relayd
+{
+       stop_lttng_relayd_nocheck
+
+       if [ $? -eq 1 ]; then
+               fail "Killed lttng-relayd (pid: $PID_RELAYD)"
+               return 1
+       else
+               pass "Killed lttng-relayd (pid: $PID_RELAYD)"
                return 0
        fi
 }
 
+#First argument: load path for automatic loading
 function start_lttng_sessiond()
 {
+
+       local load_path="$1"
        if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
                # Env variable requested no session daemon
                return
@@ -154,13 +306,18 @@ function start_lttng_sessiond()
        fi
 
        DIR=$(readlink -f $TESTDIR)
+       : ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
+       export LTTNG_SESSION_CONFIG_XSD_PATH
 
        if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
-               $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
-               #$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1 &
+               # Have a load path ?
+               if [ -n "$1" ]; then
+                       $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$1" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+               else
+                       $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+               fi
+               #$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1
                status=$?
-               # Wait for sessiond to bootstrap
-               sleep 2
                ok $status "Start session daemon"
        fi
 }
@@ -174,7 +331,7 @@ function stop_lttng_sessiond ()
 
        PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
 
-       kill $PID_SESSIOND >/dev/null 2>&1
+       kill $PID_SESSIOND >$OUTPUT_DEST
 
        if [ $? -eq 1 ]; then
                fail "Kill sessions daemon"
@@ -185,155 +342,481 @@ function stop_lttng_sessiond ()
                        out=$(pidof lt-$SESSIOND_BIN)
                        sleep 0.5
                done
+               out=1
+               while [ -n "$out" ]; do
+                       out=$(pidof $CONSUMERD_BIN)
+                       sleep 0.5
+               done
                pass "Kill session daemon"
        fi
 }
 
+function list_lttng_with_opts ()
+{
+       local opts=$1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts >$OUTPUT_DEST
+       ok $? "Lttng-tool list command with option $opts"
+}
+
 function create_lttng_session_no_output ()
 {
-       sess_name=$1
+       local sess_name=$1
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >$OUTPUT_DEST
        ok $? "Create session $sess_name in no-output mode"
 }
 
 function create_lttng_session ()
 {
-       sess_name=$1
-       trace_path=$2
+       local expected_to_fail=$1
+       local sess_name=$2
+       local trace_path=$3
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
-       ok $? "Create session $sess_name in $trace_path"
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path > $OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expected fail on session creation $sess_name in $trace_path"
+       else
+               ok $ret "Create session $sess_name in $trace_path"
+       fi
 }
 
-function enable_ust_lttng_channel()
+function create_lttng_session_ok ()
 {
-       sess_name=$1
-       channel_name=$2
+       create_lttng_session 0 "$@"
+}
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >/dev/null 2>&1
-       ok $? "Enable channel $channel_name for session $sess_name"
+function create_lttng_session_fail ()
+{
+       create_lttng_session 1 "$@"
+}
+
+
+function enable_ust_lttng_channel ()
+{
+       local expect_fail=$1
+       local sess_name=$2
+       local channel_name=$3
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
+       ret=$?
+       if [[ $expect_fail -eq "1" ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expected fail on ust channel creation $channel_name in $sess_name"
+       else
+               ok $ret "Enable channel $channel_name for session $sess_name"
+       fi
+}
+
+function enable_ust_lttng_channel_ok ()
+{
+       enable_ust_lttng_channel 0 "$@"
+}
+
+function enable_ust_lttng_channel_fail ()
+{
+       enable_ust_lttng_channel 1 "$@"
 }
 
 function disable_ust_lttng_channel()
 {
-       sess_name=$1
-       channel_name=$2
+       local sess_name=$1
+       local channel_name=$2
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
        ok $? "Disable channel $channel_name for session $sess_name"
 }
 
 function enable_lttng_mmap_overwrite_kernel_channel()
 {
-       sess_name=$1
-       channel_name=$2
+       local sess_name=$1
+       local channel_name=$2
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite >$OUTPUT_DEST
+       ok $? "Enable channel $channel_name for session $sess_name"
+}
+
+function enable_lttng_mmap_overwrite_ust_channel()
+{
+       local sess_name=$1
+       local channel_name=$2
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >$OUTPUT_DEST
        ok $? "Enable channel $channel_name for session $sess_name"
 }
 
 function enable_ust_lttng_event ()
+{
+       local expected_to_fail=$1
+       local sess_name=$2
+       local event_name="$3"
+       local channel_name=$4
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test $ret -ne "0"
+               ok $? "Enable ust event $event_name for session $session_name on channel $channel_name failed as expected"
+       else
+               ok $ret "Enable event $event_name for session $sess_name"
+       fi
+}
+
+function enable_ust_lttng_event_ok ()
+{
+       enable_ust_lttng_event 0 "$@"
+}
+
+function enable_ust_lttng_event_fail ()
+{
+       enable_ust_lttng_event 1 "$@"
+}
+
+function enable_jul_lttng_event()
 {
        sess_name=$1
        event_name="$2"
+       channel_name=$3
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u >/dev/null 2>&1
-       ok $? "Enable event $event_name for session $sess_name"
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
+       ok $? "Enable JUL event $event_name for session $sess_name"
 }
 
-function enable_ust_lttng_event_filter()
+function enable_jul_lttng_event_loglevel()
+{
+       local sess_name=$1
+       local event_name="$2"
+       local loglevel=$3
+       local channel_name=$4
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
+       ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
+}
+
+function enable_log4j_lttng_event()
+{
+       sess_name=$1
+       event_name="$2"
+       channel_name=$3
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -l >$OUTPUT_DEST
+       ok $? "Enable LOG4J event $event_name for session $sess_name"
+}
+
+function enable_log4j_lttng_event_loglevel()
+{
+       local sess_name=$1
+       local event_name="$2"
+       local loglevel=$3
+       local channel_name=$4
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l >$OUTPUT_DEST
+       ok $? "Enable LOG4J event $event_name for session $sess_name with loglevel $loglevel"
+}
+
+function enable_python_lttng_event()
 {
-       sess_name="$1"
+       sess_name=$1
        event_name="$2"
-       filter="$3"
+       channel_name=$3
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -p >$OUTPUT_DEST
+       ok $? "Enable Python event $event_name for session $sess_name"
+}
+
+function enable_python_lttng_event_loglevel()
+{
+       local sess_name=$1
+       local event_name="$2"
+       local loglevel=$3
+       local channel_name=$4
+
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -p >$OUTPUT_DEST
+       ok $? "Enable Python event $event_name for session $sess_name with loglevel $loglevel"
+}
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >/dev/null 2>&1
+function enable_ust_lttng_event_filter()
+{
+       local sess_name="$1"
+       local event_name="$2"
+       local filter="$3"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >$OUTPUT_DEST
        ok $? "Enable event $event_name with filtering for session $sess_name"
 }
 
 function enable_ust_lttng_event_loglevel()
 {
-       sess_name="$1"
-       event_name="$2"
-       loglevel="$3"
+       local sess_name="$1"
+       local event_name="$2"
+       local loglevel="$3"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >$OUTPUT_DEST
        ok $? "Enable event $event_name with loglevel $loglevel"
 }
 
 function enable_ust_lttng_event_loglevel_only()
 {
-       sess_name="$1"
-       event_name="$2"
-       loglevel="$3"
+       local sess_name="$1"
+       local event_name="$2"
+       local loglevel="$3"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >$OUTPUT_DEST
        ok $? "Enable event $event_name with loglevel-only $loglevel"
 }
 
 function disable_ust_lttng_event ()
 {
-       sess_name="$1"
-       event_name="$2"
+       local sess_name="$1"
+       local event_name="$2"
+       local channel_name="$3"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -u >/dev/null 2>&1
+       if [ -z $channel_name ]; then
+               # default channel if none specified
+               chan=""
+       else
+               chan="-c $channel_name"
+       fi
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u >$OUTPUT_DEST
        ok $? "Disable event $event_name for session $sess_name"
 }
 
+function disable_jul_lttng_event ()
+{
+       local sess_name="$1"
+       local event_name="$2"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -j >/dev/null 2>&1
+       ok $? "Disable JUL event $event_name for session $sess_name"
+}
+
+function disable_log4j_lttng_event ()
+{
+       local sess_name="$1"
+       local event_name="$2"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -l >/dev/null 2>&1
+       ok $? "Disable LOG4J event $event_name for session $sess_name"
+}
+
+function disable_python_lttng_event ()
+{
+       local sess_name="$1"
+       local event_name="$2"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -p >$OUTPUT_DEST
+       ok $? "Disable Python event $event_name for session $sess_name"
+}
+
 function start_lttng_tracing ()
 {
-       sess_name=$1
+       local expected_to_fail=$1
+       local sess_name=$2
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
-       ok $? "Start tracing for session $sess_name"
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expected fail on start tracing for session: $sess_name"
+       else
+               ok $ret "Start tracing for session $sess_name"
+       fi
+}
+
+function start_lttng_tracing_ok ()
+{
+       start_lttng_tracing 0 "$@"
+}
+
+function start_lttng_tracing_fail ()
+{
+       start_lttng_tracing 1 "$@"
 }
 
 function stop_lttng_tracing ()
 {
-       sess_name=$1
+       local expected_to_fail=$1
+       local sess_name=$2
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expected fail on stop tracing for session: $sess_name"
+       else
+               ok $ret "Stop lttng tracing for session $sess_name"
+       fi
+}
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
-       ok $? "Stop lttng tracing for session $sess_name"
+function stop_lttng_tracing_ok ()
+{
+       stop_lttng_tracing 0 "$@"
+}
+
+function stop_lttng_tracing_fail ()
+{
+       stop_lttng_tracing 1 "$@"
 }
 
 function destroy_lttng_session ()
 {
-       sess_name=$1
+       local expected_to_fail=$1
+       local sess_name=$2
 
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expected fail on session deletion $sess_name"
+       else
+               ok $ret "Destroy session $sess_name"
+       fi
+}
+
+function destroy_lttng_session_ok ()
+{
+       destroy_lttng_session 0 "$@"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1
-       ok $? "Destroy lttng session $sess_name"
+}
+
+function destroy_lttng_session_fail ()
+{
+       destroy_lttng_session 1 "$@"
+}
+
+
+function destroy_lttng_sessions ()
+{
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
+       ok $? "Destroy all lttng sessions"
 }
 
 function lttng_snapshot_add_output ()
 {
-       sess_name=$1
-       trace_path=$2
+       local sess_name=$1
+       local trace_path=$2
+       local expected_to_fail=$3
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail ]]; then
+               test "$ret" -ne "0"
+               ok $? "Failed to add a  snapshot output file://$trace_path as expected"
+       else
+               ok $ret "Added snapshot output file://$trace_path"
+       fi
+}
+
+function lttng_snapshot_del_output ()
+{
+       local sess_name=$1
+       local id=$2
+       local expected_to_fail=$3
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >/dev/null 2>&1
-       ok $? "Added snapshot output file://$trace_path"
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >$OUTPUT_DEST
+       ret=$?
+       if [[ $expected_to_fail ]]; then
+               test "$ret" -ne "0"
+               ok $? "Expect fail on deletion of snapshot output id $id"
+       else
+               ok $ret "Deleted snapshot output id $id"
+       fi
 }
 
 function lttng_snapshot_record ()
 {
-       sess_name=$1
-       trace_path=$2
+       local sess_name=$1
+       local trace_path=$2
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name >$OUTPUT_DEST
        ok $? "Snapshot recorded"
 }
 
+function lttng_snapshot_list ()
+{
+       local sess_name=$1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name >$OUTPUT_DEST
+       ok $? "Snapshot list"
+}
+
+function lttng_save()
+{
+       local sess_name=$1
+       local opts=$2
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts >$OUTPUT_DEST
+       ok $? "Session successfully saved"
+}
+
+function lttng_load()
+{
+       local opts=$1
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts >$OUTPUT_DEST
+       ok $? "Load command successful"
+}
+
 function trace_matches ()
 {
-       event_name=$1
-       nr_iter=$2
-       trace_path=$3
+       local event_name=$1
+       local nr_iter=$2
+       local trace_path=$3
 
        which $BABELTRACE_BIN >/dev/null
        skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
 
-       count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
+       local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
 
        if [ "$count" -ne "$nr_iter" ]; then
                fail "Trace match"
@@ -343,10 +826,30 @@ function trace_matches ()
        fi
 }
 
+function trace_match_only()
+{
+       local event_name=$1
+       local nr_iter=$2
+       local trace_path=$3
+
+       which $BABELTRACE_BIN >/dev/null
+       skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+
+       local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
+       local total=$($BABELTRACE_BIN $trace_path | wc -l)
+
+    if [ "$nr_iter" -eq "$count" ] && [ "$total" -eq "$nr_iter" ]; then
+        pass "Trace match with $total event $event_name"
+    else
+        fail "Trace match"
+        diag "$total event(s) found, expecting $nr_iter of event $event_name and only found $count"
+    fi
+}
+
 function validate_trace
 {
-       event_name=$1
-       trace_path=$2
+       local event_name=$1
+       local trace_path=$2
 
        which $BABELTRACE_BIN >/dev/null
        if [ $? -ne 0 ]; then
@@ -358,7 +861,7 @@ function validate_trace
        for i in $event_name; do
                traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $i | wc -l)
                if [ "$traced" -ne 0 ]; then
-                       pass "Validate trace for event $i"
+                       pass "Validate trace for event $i, $traced events"
                else
                        fail "Validate trace for event $i"
                        diag "Found $traced occurences of $i"
@@ -368,3 +871,63 @@ function validate_trace
        IFS=$OLDIFS
        return $ret
 }
+
+function validate_trace_exp()
+{
+       local event_exp=$1
+       local trace_path=$2
+
+       which $BABELTRACE_BIN >/dev/null
+       skip $? -ne 0 "Babeltrace binary not found. Skipping trace validation"
+
+       traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep ${event_exp} | wc -l)
+       if [ "$traced" -ne 0 ]; then
+               pass "Validate trace for expression '${event_exp}', $traced events"
+       else
+               fail "Validate trace for expression '${event_exp}'"
+               diag "Found $traced occurences of '${event_exp}'"
+       fi
+       ret=$?
+       return $ret
+}
+
+function validate_trace_only_exp()
+{
+       local event_exp=$1
+       local trace_path=$2
+
+       which $BABELTRACE_BIN >/dev/null
+       skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+
+       local count=$($BABELTRACE_BIN $trace_path | grep ${event_exp} | wc -l)
+       local total=$($BABELTRACE_BIN $trace_path | wc -l)
+
+       if [ "$count" -ne 0 ] && [ "$total" -eq "$count" ]; then
+               pass "Trace match with $total for expression '${event_exp}"
+       else
+               fail "Trace match"
+               diag "$total syscall event(s) found, only syscalls matching expression '${event_exp}' ($count occurrences) are expected"
+       fi
+       ret=$?
+       return $ret
+}
+
+function validate_trace_empty()
+{
+       local trace_path=$1
+
+       which $BABELTRACE_BIN >/dev/null
+       if [ $? -ne 0 ]; then
+           skip 0 "Babeltrace binary not found. Skipping trace validation"
+       fi
+
+       traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | wc -l)
+       if [ "$traced" -eq 0 ]; then
+               pass "Validate empty trace"
+       else
+               fail "Validate empty trace"
+               diag "Found $traced events in trace"
+       fi
+       ret=$?
+       return $ret
+}
This page took 0.033548 seconds and 4 git commands to generate.