X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fstress%2Ftest_multi_sessions_per_uid_10app;h=82e8ad505bbd4d9f789a5032afe8a0794389dcb7;hp=c25e303b03e38690fe0d61a2aec9fb60e83b3d01;hb=c7031a2c707646804e0088d069578d5eb74fc01e;hpb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00 diff --git a/tests/stress/test_multi_sessions_per_uid_10app b/tests/stress/test_multi_sessions_per_uid_10app index c25e303b0..82e8ad505 100755 --- 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