Fix: disable event for JUL domain

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

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 63b5eefed93ba728656da62fc21d5337bfec1338..c2bebf4a267e856dde080643608322c39c8923d5 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -108,7 +108,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 >/dev/null 2>&1
                #$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
                if [ $? -eq 1 ]; then
                        fail "Start lttng-relayd (opt: $opt)"
@@ -121,22 +121,33 @@ function start_lttng_relayd
        fi
 }
 
-function stop_lttng_relayd
+function stop_lttng_relayd_nocheck
 {
        PID_RELAYD=`pidof lt-$RELAYD_BIN`
 
+       diag "Killing lttng-relayd (pid: $PID_RELAYD)"
        kill $PID_RELAYD >/dev/null 2>&1
+       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
 }
@@ -280,6 +291,24 @@ function enable_jul_lttng_event()
        ok $? "Enable JUL event $event_name for session $sess_name"
 }
 
+function enable_jul_lttng_event_loglevel()
+{
+       sess_name=$1
+       event_name="$2"
+       loglevel=$3
+       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 >/dev/null 2>&1
+       ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
+}
+
 function enable_ust_lttng_event_filter()
 {
        sess_name="$1"
@@ -319,6 +348,15 @@ function disable_ust_lttng_event ()
        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 start_lttng_tracing ()
 {
        sess_name=$1
@@ -415,3 +453,23 @@ function validate_trace
        IFS=$OLDIFS
        return $ret
 }
+
+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
+}