Acquire a reference to a session when a timer is active

[lttng-tools.git] / tests / stress / test_multi_sessions_per_uid_10app

diff --git a/tests/stress/test_multi_sessions_per_uid_10app b/tests/stress/test_multi_sessions_per_uid_10app
index 91950be0e071903cf72177005f97a29c3c52e41d..82e8ad505bbd4d9f789a5032afe8a0794389dcb7 100755 (executable)
--- a/tests/stress/test_multi_sessions_per_uid_10app
+++ b/tests/stress/test_multi_sessions_per_uid_10app
@@ -43,7 +43,7 @@ function enable_channel_per_uid()
 
 function check_sessiond()
 {
-       if [ -z "$(pidof lt-lttng-sessiond)" ]; then
+       if [ -z "$(pgrep --full lt-lttng-sessiond)" ]; then
                local str_date=$(date +%H%M%S-%d%m%Y)
 
                diag "!!!The session daemon died unexpectedly!!!"
@@ -57,15 +57,13 @@ function check_sessiond()
 
 function start_sessiond()
 {
-       local SESSIOND_BIN="lttng-sessiond"
-
        validate_kernel_version
        if [ $? -ne 0 ]; then
                fail "Start session daemon"
                BAIL_OUT "*** Kernel too old for session daemon tests ***"
        fi
 
-       if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+       if [ -z $(pgrep --full lt-$SESSIOND_BIN) ]; then
                # We have to start it like this so the ulimit -c is used by this
                # process. Also, we collect any error message printed out.
                $TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --background --consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE 2>&1
@@ -84,14 +82,14 @@ test_stress()
                        check_sessiond
                        enable_ust_lttng_event_ok $SESSION_NAME-$a $EVENT_NAME
                        check_sessiond
-                       start_lttng_tracing $SESSION_NAME-$a
+                       start_lttng_tracing_ok $SESSION_NAME-$a
                        check_sessiond
                done
 
                for a in $(seq 1 $NR_SESSION); do
-                       stop_lttng_tracing $SESSION_NAME-$a
+                       stop_lttng_tracing_ok $SESSION_NAME-$a
                        check_sessiond
-                       destroy_lttng_session $SESSION_NAME-$a
+                       destroy_lttng_session_ok $SESSION_NAME-$a
                        check_sessiond
                done
        done