X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=4fa31952cb6719a20567ae86152c3350c8377303;hb=164bff35f233e2b566344eca0d31b448dbc595aa;hp=a6f9a8b6c05cad9b0d5c6dd20ccc5d64792d3b71;hpb=3bfde48aceec7b73b8fe74e5c75fad0f795e67d6;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index a6f9a8b6c..4fa31952c 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -148,7 +148,7 @@ function lttng_pgrep ()
 
 	while IFS= read -r pid ; do
 		# /proc/pid/cmdline is null separated.
-		if full_command_no_argument=$(tr '\0' '\n' < /proc/"$pid"/cmdline 2>/dev/null | head -n1); then
+		if full_command_no_argument=$( (tr '\0' '\n' < /proc/"$pid"/cmdline) 2>/dev/null | head -n1); then
 			command_basename=$(basename "$full_command_no_argument")
 			if grep -q "$pattern" <<< "$command_basename"; then
 				echo "$pid"
@@ -282,6 +282,16 @@ function get_exposed_cpus_list()
 	echo "${list[@]}"
 }
 
+# Return any available CPU found. Do not make assumption about the returned
+# value, e.g. that it could be 0.
+function get_any_available_cpu()
+{
+	for cpu in /sys/devices/system/cpu/cpu[0-9]*; do
+		echo "${cpu#/sys/devices/system/cpu/cpu}"
+		break;
+	done
+}
+
 # Return the number of _configured_ CPUs.
 function conf_proc_count()
 {
@@ -1504,9 +1514,14 @@ function enable_ust_lttng_event_loglevel()
 	local sess_name="$1"
 	local event_name="$2"
 	local loglevel="$3"
+	local channel_name="$4"
+	local chan=()
+	if [ -n "${channel_name}" ] ; then
+		chan=('-c' "${channel_name}")
+	fi
 
 	_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
-		enable-event "$event_name" -s $sess_name -u --loglevel $loglevel
+		enable-event "${chan[@]}" "$event_name" -s "${sess_name}" -u --loglevel="${loglevel}"
 	ok $? "Enable event $event_name with loglevel $loglevel"
 }
 
@@ -1515,9 +1530,14 @@ function enable_ust_lttng_event_loglevel_only()
 	local sess_name="$1"
 	local event_name="$2"
 	local loglevel="$3"
+	local channel_name="$4"
+	local chan=()
+	if [ -n "${channel_name}" ] ; then
+		chan=('-c' "${channel_name}")
+	fi
 
 	_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
-		enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel
+		enable-event "${chan[@]}" "$event_name" -s "${sess_name}" -u --loglevel-only "${loglevel}"
 	ok $? "Enable event $event_name with loglevel-only $loglevel"
 }