X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils.sh;h=23b2dfd0737c8a3d401939ca66218d06b1f5961b;hp=b4b2451018dc6e05764a16dbfd9bd130c4780468;hb=26b53d3b7ce1812a2ebc2c7153a50d35bba2a270;hpb=c38b5107fcb9435ea7584e82f6c61319a9391fc0

diff --git a/tests/utils.sh b/tests/utils.sh
index b4b245101..23b2dfd07 100644
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -128,7 +128,7 @@ function lttng_enable_kernel_event
 	fi
 }
 
-function lttng_start_relayd
+function start_lttng_relayd
 {
 	local opt="$1"
 
@@ -150,7 +150,7 @@ function lttng_start_relayd
 	fi
 }
 
-function lttng_stop_relayd
+function stop_lttng_relayd
 {
 	PID_RELAYD=`pidof lt-$RELAYD_BIN`
 
@@ -170,7 +170,7 @@ function lttng_stop_relayd
 	fi
 }
 
-function start_sessiond()
+function start_lttng_sessiond()
 {
 	if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
 		# Env variable requested no session daemon
@@ -192,7 +192,7 @@ function start_sessiond()
 	sleep 2
 }
 
-function stop_sessiond ()
+function stop_lttng_sessiond ()
 {
 	if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
 		# Env variable requested no session daemon
@@ -264,10 +264,76 @@ function disable_lttng_channel()
 function enable_ust_lttng_event ()
 {
 	sess_name=$1
-	event_name=$2
+	event_name="$2"
 
 	echo -n "Enabling lttng event $event_name for session $sess_name "
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u >/dev/null 2>&1
+	if [ $? -eq 1 ]; then
+		print_fail
+		return 1
+	else
+		print_ok
+	fi
+}
+
+function enable_ust_lttng_event_filter()
+{
+	sess_name="$1"
+	event_name="$2"
+	filter="$3"
+	echo -n "Enabling lttng event with filtering "
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --filter "$filter" 2>&1 >/dev/null
+	if [ $? -eq 0 ]; then
+		print_ok
+		return 0
+	else
+		print_fail
+		return 1
+	fi
+}
+
+function enable_ust_lttng_event_loglevel()
+{
+	sess_name="$1"
+	event_name="$2"
+	loglevel="$3"
+	echo -n "Enabling lttng event $event_name with loglevel $loglevel"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --loglevel $loglevel 2>&1 >/dev/null
+	if [ $? -eq 0 ]; then
+		print_ok
+		return 0
+	else
+		print_fail
+		return 1
+	fi
+}
+
+function enable_ust_lttng_event_loglevel_only()
+{
+	sess_name="$1"
+	event_name="$2"
+	loglevel="$3"
+	echo -n "Enabling lttng event $event_name with loglevel-only $loglevel"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --loglevel-only $loglevel 2>&1 >/dev/null
+	if [ $? -eq 0 ]; then
+		print_ok
+		return 0
+	else
+		print_fail
+		return 1
+	fi
+}
+
+function disable_ust_lttng_event ()
+{
+	sess_name=$1
+	event_name=$2
+
+	echo -n "Disabling lttng event $event_name for session $sess_name "
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event $event_name -s $sess_name -u >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		print_fail
 		return 1
@@ -276,7 +342,7 @@ function enable_ust_lttng_event ()
 	fi
 }
 
-function start_tracing ()
+function start_lttng_tracing ()
 {
 	sess_name=$1
 
@@ -290,7 +356,7 @@ function start_tracing ()
 	fi
 }
 
-function stop_tracing ()
+function stop_lttng_tracing ()
 {
 	sess_name=$1