Tests: wording of trace_matches is misleading

[lttng-tools.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 2cadd58002907605e0ee6cb01b315f8cc2d4c246..12bcc991a86dc5c4068a1d7f2ba48ca67c4769ec 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -16,6 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 SESSIOND_BIN="lttng-sessiond"
+RUNAS_BIN="lttng-runas"
 CONSUMERD_BIN="lttng-consumerd"
 RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
@@ -411,7 +412,7 @@ function stop_lttng_sessiond_opt()
                return
        fi
 
-       PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN`
+       PID_SESSIOND="$(pgrep --full lt-$SESSIOND_BIN) $(pgrep --full $RUNAS_BIN)"
 
        if [ -n "$2" ]; then
                kill_opt="$kill_opt -s $signal"
@@ -463,7 +464,7 @@ function sigstop_lttng_sessiond_opt()
                return
        fi
 
-       PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN`
+       PID_SESSIOND="$(pgrep --full lt-$SESSIOND_BIN) $(pgrep --full $RUNAS_BIN)"
 
        kill_opt="$kill_opt -s $signal"
 
@@ -1197,7 +1198,7 @@ function trace_matches ()
 
        if [ "$count" -ne "$nr_iter" ]; then
                fail "Trace match"
-               diag "$count events found in trace"
+               diag "$count matching events found in trace"
        else
                pass "Trace match"
        fi