X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=a09089afd4c7313a80415dfc9d707fdc75795d4f;hp=5fca4a0227ceaec51cd9c46c2ae746520a851af2;hb=ebaaaf5e2dd16fc390337d86faa089707fdd152e;hpb=10a5031171c7bca5b4498c871b119e5a88b6a3fb

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 5fca4a022..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
+
+	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" -s $sess_name -u >/dev/null 2>&1
+	$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"
 }
 
@@ -367,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"