X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=88304eb80083629b9e26a729ff046ae8855abda4;hb=c864d6d788c58de94111911a9e10d221ec8bc398;hp=6421af1b5c5ed47dc02c67e3703b737d18aa250a;hpb=6f137cef6cb86bf40f973d62f744536f91926ad3;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 6421af1b5..88304eb80 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -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"