X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fstress%2Ftest_multi_sessions_per_uid_5app_streaming_kill_relayd;h=0f6e49a9fe62a9fc57938e6cec2c83efc4a7cae5;hb=3e46b4ca56f63bddb99098556060898e07df8c06;hp=c3fdeb13da933a0144cd9098640733eb2157c55c;hpb=c4926bb5e18ba7916ff2a5d2c70ed6b099643e73;p=lttng-tools.git

diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
index c3fdeb13d..0f6e49a9f 100755
--- a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
+++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
@@ -52,7 +52,7 @@ function lttng_create_session_uri
 
 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!!!"
@@ -74,7 +74,7 @@ function start_sessiond()
 		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_SESSIOND 2>&1
@@ -90,7 +90,7 @@ function start_relayd
 	local opt=$1
 	local RELAYD_BIN="lttng-relayd"
 
-	if [ -z $(pidof lt-$RELAYD_BIN) ]; then
+	if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
 		$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
 		ok $? "Start lttng-relayd (opt: \"$opt\")"
 	fi
@@ -98,7 +98,7 @@ function start_relayd
 
 function check_relayd()
 {
-	if [ -z "$(pidof lt-lttng-relayd)" ]; then
+	if [ -z "$(pgrep --full lt-lttng-relayd)" ]; then
 		local str_date=$(date +%H%M%S-%d%m%Y)
 
 		#diag "Relay daemon died. Starting it again"
@@ -122,16 +122,16 @@ test_stress()
 			enable_ust_lttng_event_ok $SESSION_NAME-$a $EVENT_NAME
 			check_sessiond
 			check_relayd
-			start_lttng_tracing $SESSION_NAME-$a
+			start_lttng_tracing_ok $SESSION_NAME-$a
 			check_sessiond
 			check_relayd
 		done
 
 		for a in $(seq 1 $NR_SESSION); do
-			stop_lttng_tracing $SESSION_NAME-$a
+			stop_lttng_tracing_ok $SESSION_NAME-$a
 			check_sessiond
 			check_relayd
-			destroy_lttng_session $SESSION_NAME-$a
+			destroy_lttng_session_ok $SESSION_NAME-$a
 			check_sessiond
 			check_relayd
 		done