X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=b2991207a8b9f348c38792ccbdbe6b71a24ef6f1;hb=bb901ead0aea0fecad53e661ed79067faa4149c8;hp=9ff25a0a57762fb029b91958a5c4b7183123f5ef;hpb=76404ef0a5abfd5151b2ba805cf142eb2b9d3c71;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 9ff25a0a5..b2991207a 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -718,7 +718,7 @@ function stop_lttng_sessiond_opt()
 	fi
 
 	if [ -z "$pids" ]; then
-		if [ "$is_cleanup" -eq 1 ]; then 
+		if [ "$is_cleanup" -eq 1 ]; then
 			:
 		elif [ "$withtap" -eq "1" ]; then
 			fail "No session daemon to kill"
@@ -1783,7 +1783,7 @@ function validate_metadata_event ()
 	local nr_event_id=$2
 	local trace_path=$3
 
-	local metadata_file=$(find $trace_path | grep metadata)
+	local metadata_file=$(find $trace_path -name "metadata")
 	local metadata_path=$(dirname $metadata_file)
 
 	which $BABELTRACE_BIN >/dev/null
@@ -2249,8 +2249,8 @@ function lttng_remove_trigger_ok()
 
 function list_triggers_matches_ok ()
 {
-	local tmp_stdout=$(mktemp -t test_list_triggers_cli_stdout.XXXXXX)
-	local tmp_stderr=$(mktemp -t test_list_triggers_cli_stderr.XXXXXX)
+	local tmp_stdout=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	local tmp_stderr=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
 
 	local test_name="$1"
 	local expected_stdout_file="$2"