X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=ea354cf62fc4236f4201e834e0353d0317eb1210;hb=c29d17cd2d85f6ee89037377cc33821829529867;hp=1428afd62841ad99a930fc6fee7be617a2ddf1e0;hpb=eb9605eaf65c0c4858511a10e6ae6398cc2dc1c8;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 1428afd62..ea354cf62 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=$(cut -d '' -f 1 2>/dev/null < /proc/"$pid"/cmdline); 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"
@@ -2376,8 +2376,8 @@ function lttng_remove_trigger_ok()
 
 function list_triggers_matches_ok ()
 {
-	local tmp_stdout=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
-	local tmp_stderr=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
+	local tmp_stdout=$(mktemp -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	local tmp_stderr=$(mktemp -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
 
 	local test_name="$1"
 	local expected_stdout_file="$2"
@@ -2406,9 +2406,9 @@ function list_triggers_matches_mi_ok ()
 	local test_name="$1"
 	local expected_stdout_file="$2"
 
-	tmp_stdout_raw=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
-	tmp_stdout=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
-	tmp_stderr=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
+	tmp_stdout_raw=$(mktemp -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	tmp_stdout=$(mktemp -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	tmp_stderr=$(mktemp -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
 
 	diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi xml list-triggers"