X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=968a6e61305ac92d1d633856027130f712584a5a;hp=f73b1764c7c32750f3e8a44fd44edcfe4f9bb69b;hb=37175ce4620a721d90235d7c906e49ecc14f62e3;hpb=07b86b528dc279d59cdf16e6cb946c144fe773f2

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index f73b1764c..968a6e613 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -156,11 +156,9 @@ function start_lttng_sessiond()
 	DIR=$(readlink -f $TESTDIR)
 
 	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
-		$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+		$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
 		#$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1 &
 		status=$?
-		# Wait for sessiond to bootstrap
-		sleep 2
 		ok $status "Start session daemon"
 	fi
 }
@@ -233,15 +231,49 @@ 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"
 }
 
+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"
@@ -315,6 +347,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 +399,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"