X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=a09089afd4c7313a80415dfc9d707fdc75795d4f;hb=31d74dc385476ad569ee971eea0cf1d8d88bed58;hp=f73b1764c7c32750f3e8a44fd44edcfe4f9bb69b;hpb=07b86b528dc279d59cdf16e6cb946c144fe773f2;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index f73b1764c..a09089afd 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -233,12 +233,29 @@ function enable_lttng_mmap_overwrite_kernel_channel()
 	ok $? "Enable channel $channel_name for session $sess_name"
 }
 
+function enable_lttng_mmap_overwrite_ust_channel()
+{
+	sess_name=$1
+	channel_name=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >/dev/null 2>&1
+	ok $? "Enable channel $channel_name for session $sess_name"
+}
+
 function enable_ust_lttng_event ()
 {
 	sess_name=$1
 	event_name="$2"
+	channel_name=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u >/dev/null 2>&1
+	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 -u >/dev/null 2>&1
 	ok $? "Enable event $event_name for session $sess_name"
 }
 
@@ -315,6 +332,15 @@ function lttng_snapshot_add_output ()
 	ok $? "Added snapshot output file://$trace_path"
 }
 
+function lttng_snapshot_del_output ()
+{
+	local sess_name=$1
+	local id=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >/dev/null 2>&1
+	ok $? "Deleted snapshot output id $id"
+}
+
 function lttng_snapshot_record ()
 {
 	sess_name=$1
@@ -358,7 +384,7 @@ function validate_trace
 	for i in $event_name; do
 		traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $i | wc -l)
 		if [ "$traced" -ne 0 ]; then
-			pass "Validate trace for event $i"
+			pass "Validate trace for event $i, $traced events"
 		else
 			fail "Validate trace for event $i"
 			diag "Found $traced occurences of $i"