X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fworking-directory%2Ftest_relayd_working_directory;h=24b87a9cc1eb15003e72232778dc4d9bc656aa26;hb=f04a82006fc82e66b505b9428b0f54b533d6ddf0;hp=8856a921bee5386a686aaff338018d5645b301eb;hpb=15da468cd331b1c6d72e9bd6ee5afd472c66242d;p=lttng-tools.git

diff --git a/tests/regression/tools/working-directory/test_relayd_working_directory b/tests/regression/tools/working-directory/test_relayd_working_directory
index 8856a921b..24b87a9cc 100755
--- a/tests/regression/tools/working-directory/test_relayd_working_directory
+++ b/tests/regression/tools/working-directory/test_relayd_working_directory
@@ -67,7 +67,7 @@ function test_relayd_daemon()
 
 	start_lttng_relayd_opt 1 "-d" "--working-directory $working_dir"
 
-	pid=$(pgrep "$RELAYD_MATCH")
+	pid=$(lttng_pgrep "$RELAYD_MATCH")
 	ok $? "Found lttng-relayd"
 
 	cwd=$(readlink "/proc/${pid}/cwd")
@@ -88,7 +88,7 @@ function test_relayd_daemon_no_working_dir()
 
 	start_lttng_relayd_opt 1 "-d" ""
 
-	pid=$(pgrep "$RELAYD_MATCH")
+	pid=$(lttng_pgrep "$RELAYD_MATCH")
 	ok $? "Found lttng-relayd"
 
 	cwd=$(readlink "/proc/${pid}/cwd")
@@ -111,7 +111,7 @@ function test_relayd_background()
 
 	start_lttng_relayd_opt 1 "-b" "--working-directory $working_dir"
 
-	pid=$(pgrep "$RELAYD_MATCH")
+	pid=$(lttng_pgrep "$RELAYD_MATCH")
 	ok $? "Found lttng-relayd"
 
 	cwd=$(readlink "/proc/${pid}/cwd")
@@ -132,7 +132,7 @@ function test_relayd_background_no_working_dir()
 
 	start_lttng_relayd_opt 1 "-b" ""
 
-	pid=$(pgrep "$RELAYD_MATCH")
+	pid=$(lttng_pgrep "$RELAYD_MATCH")
 	ok $? "Found lttng-relayd"
 
 	cwd=$(readlink "/proc/${pid}/cwd")
@@ -169,9 +169,10 @@ function test_relayd_debug_permission()
 
 		# Redirect the error output to a temporary file
 
-		ERROR_OUTPUT_DEST=$(mktemp) start_lttng_relayd_opt 1 "-b" "-v --working-dir $working_dir"
+		ERROR_OUTPUT_DEST=$(mktemp)
+		start_lttng_relayd_opt 1 "-b" "-v --working-dir $working_dir"
 
-		pid=$(pgrep "$RELAYD_MATCH")
+		pid=$(lttng_pgrep "$RELAYD_MATCH")
 		ok $? "Found lttng-relayd"
 
 		cwd=$(readlink "/proc/${pid}/cwd")
@@ -207,7 +208,7 @@ function test_relayd_failure()
 	test $? -eq "1"
 	ok $? "Expect failure to start lttng-relayd for non-existent working directory"
 
-	pid=$(pgrep "$RELAYD_MATCH")
+	pid=$(lttng_pgrep "$RELAYD_MATCH")
 	if [ -z "$pid" ]; then
 		pass "No lttng-relayd present"
 	else
@@ -236,7 +237,7 @@ function test_relayd_env()
 	export LTTNG_RELAYD_WORKING_DIRECTORY=${working_dir}
 	start_lttng_relayd_opt 1 "-b" ""
 
-	pid=$(pgrep "$RELAYD_MATCH")
+	pid=$(lttng_pgrep "$RELAYD_MATCH")
 	ok $? "Found lttng-relayd"
 
 	cwd=$(readlink "/proc/$pid/cwd")
@@ -263,7 +264,7 @@ function test_relayd_cmdline_overwrite_env()
 	export LTTNG_RELAYD_WORKING_DIRECTORY=${working_dir_env}
 	start_lttng_relayd_opt 1 "-b" "--working-dir ${working_dir_cmdline}"
 
-	pid=$(pgrep "$RELAYD_MATCH")
+	pid=$(lttng_pgrep "$RELAYD_MATCH")
 	ok $? "Found lttng-relayd"
 
 	cwd=$(readlink "/proc/$pid/cwd")