X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=a1e142487024b8a6966321a8aba87e04f4a685eb;hb=0de2479d5f5a287d31c69e34ea5202a69019f224;hp=574495704a83baa5f2ba30f273131495eef0f3f2;hpb=d0e263e7e628d2eba76c883ffc6fb92065e440c7;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 574495704..a1e142487 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -100,7 +100,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 < /proc/"$pid"/cmdline); then + if full_command_no_argument=$(cut -d '' -f 1 2>/dev/null < /proc/"$pid"/cmdline); then command_basename=$(basename "$full_command_no_argument") if grep -q "$pattern" <<< "$command_basename"; then echo "$pid" @@ -646,7 +646,9 @@ function stop_lttng_sessiond_opt() if [ -z "$pids" ]; then if [ "$withtap" -eq "1" ]; then - pass "No session daemon to kill" + fail "No session daemon to kill" + else + BAIL_OUT "No session daemon to kill" fi return 0 fi