X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=c433d6c7223077cdd16051a710de7f26d5e8a463;hb=f76139921e301236823c5cb093c37ce237e3ae89;hp=9e2c12d0be68de3cd2c8f6bd5d43a532bf6c3b78;hpb=df442a141af71cd983f04a5d4d59002c82b0dacd;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 9e2c12d0b..c433d6c72 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -16,6 +16,7 @@
 # 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"
@@ -183,6 +184,11 @@ 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
 }
@@ -257,6 +263,23 @@ function enable_ust_lttng_event ()
 	ok $? "Enable event $event_name for session $sess_name"
 }
 
+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" $chan -s $sess_name -j >/dev/null 2>&1
+	ok $? "Enable JUL event $event_name for session $sess_name"
+}
+
 function enable_ust_lttng_event_filter()
 {
 	sess_name="$1"