X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fworking-directory%2Ftest_relayd_working_directory;h=58f00496fbba169d0da189746a7b4c059487c2f3;hb=a8cf8647df1373385689de55ba67ddea6fc3e5c3;hp=956cb780a6e368c7239aa51cff73b03f757bce65;hpb=b2f4c4fadc015bd2506d6940082a61683e565f1a;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 956cb780a..58f00496f 100755
--- a/tests/regression/tools/working-directory/test_relayd_working_directory
+++ b/tests/regression/tools/working-directory/test_relayd_working_directory
@@ -1,19 +1,8 @@
 #!/bin/bash
 #
-# Copyright (C) - 2018 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2018 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
 
 TEST_DESC="Change working directory of process"
 
@@ -78,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")
@@ -99,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")
@@ -122,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")
@@ -143,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")
@@ -156,35 +145,47 @@ function test_relayd_background_no_working_dir()
 
 function test_relayd_debug_permission()
 {
-	local output_pattern='Working directory \".*\" is not writable'
-	local working_dir
-	local cwd
-	local pid
-
-	working_dir=$(realpath "$(mktemp -d)")
+	local is_user
 
 	diag "Test lttng-relayd change working directory on non writable directory"
 
-	# Removing write access to working dir
-	okx chmod -w "$working_dir"
+	if [ "$(id -u)" == "0" ]; then
+	    is_user=0
+	else
+	    is_user=1
+	fi
+
+	skip $is_user "Skipping permission debug output test; operation can't fail as root" 6 ||
+	{
+		local output_pattern='Working directory \".*\" is not writable'
+		local working_dir
+		local cwd
+		local pid
 
-	# Redirect the error output to a temporary file
-	ERROR_OUTPUT_DEST=$(mktemp)
-	start_lttng_relayd_opt 1 "-b" "-v --working-dir $working_dir"
+		working_dir=$(realpath "$(mktemp -d)")
 
-	pid=$(pgrep "$RELAYD_MATCH")
-	ok $? "Found lttng-relayd"
+		# Removing write access to working dir
+		okx chmod -w "$working_dir"
 
-	cwd=$(readlink "/proc/${pid}/cwd")
-	is "$cwd" "$working_dir" "Working directory changed"
+		# Redirect the error output to a temporary file
 
-	grep -q "$output_pattern" "$ERROR_OUTPUT_DEST"
-	ok $? "Warning about missing write permission is present"
+		ERROR_OUTPUT_DEST=$(mktemp)
+		start_lttng_relayd_opt 1 "-b" "-v --working-dir $working_dir"
 
-	stop_lttng_relayd
-	rm "$ERROR_OUTPUT_DEST"
-	rm -rf "$working_dir" "$ERROR_OUTPUT_DEST"
-	ERROR_OUTPUT_DEST=/dev/null
+		pid=$(lttng_pgrep "$RELAYD_MATCH")
+		ok $? "Found lttng-relayd"
+
+		cwd=$(readlink "/proc/${pid}/cwd")
+		is "$cwd" "$working_dir" "Working directory changed"
+
+		grep -q "$output_pattern" "$ERROR_OUTPUT_DEST"
+		ok $? "Warning about missing write permission is present"
+
+		stop_lttng_relayd
+		rm "$ERROR_OUTPUT_DEST"
+		rm -rf "$working_dir" "$ERROR_OUTPUT_DEST"
+		ERROR_OUTPUT_DEST=/dev/null
+	}
 }
 
 function test_relayd_failure()
@@ -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
@@ -228,7 +229,6 @@ function test_relayd_env()
 	local cwd
 	local pid
 
-	working_dir=$(mktemp -d)
 	working_dir=$(realpath "$(mktemp -d)")
 
 	diag "Test lttng-relayd change working directory from env. variable"
@@ -236,7 +236,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 +263,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")