X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=b2991207a8b9f348c38792ccbdbe6b71a24ef6f1;hb=202486fa276e34e4c81d560bfd8897824c51af8c;hp=530a1062389a7f667fdf82732fd297ebf7bfcbdc;hpb=fc2dd19e2c7dbeaa86654b47c0a2c221b7018ecf;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 530a10623..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" @@ -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"