X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=8cb664dd5c51a4c0bc116cbfa6c00eed2980a983;hb=6746f4f287d6322f02977977470ab737acdd27b4;hp=a1a26d9df00a67c761ece45efd5ad8eba4f987f7;hpb=e02b109ba0132f2c715fdb9db55cbdf8f8203749;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index a1a26d9df..8cb664dd5 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -166,6 +166,8 @@ 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 --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
@@ -348,6 +350,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
@@ -461,3 +472,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
+}