X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=7da125654cd21a6f7be191a63ee2680ae1e6ac68;hp=1b2f71f183b764977acd05985b48966c8e9db56a;hb=1831ae68b70dece8e9b847081526495adbbf05e5;hpb=ba5e8d0abf1a68803de9d773fe977792e7b0b5e8

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 1b2f71f18..7da125654 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1,17 +1,7 @@
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2012 David Goulet <dgoulet@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.
+# SPDX-License-Identifier: LGPL-2.1-only
 #
-# 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
 
 SESSIOND_BIN="lttng-sessiond"
 SESSIOND_MATCH=".*lttng-sess.*"
@@ -46,7 +36,7 @@ export LTTNG_SESSIOND_PATH="/bin/true"
 
 source $TESTDIR/utils/tap/tap.sh
 
-if [ -z $LTTNG_TEST_TEARDOWN_TIMEOUT ]; then
+if [ -z ${LTTNG_TEST_TEARDOWN_TIMEOUT+x} ]; then
 	LTTNG_TEST_TEARDOWN_TIMEOUT=60
 fi
 
@@ -402,7 +392,7 @@ function start_lttng_relayd_opt()
 
 	DIR=$(readlink -f "$TESTDIR")
 
-	if [ -z $(pgrep $RELAYD_MATCH) ]; then
+	if [ -z $(pgrep -f $RELAYD_MATCH) ]; then
 		# shellcheck disable=SC2086
 		$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $process_mode $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
 		#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
@@ -451,7 +441,7 @@ function stop_lttng_relayd_opt()
 	local retval=0
 	local pids=
 
-	pids=$(pgrep "$RELAYD_MATCH")
+	pids=$(pgrep -f "$RELAYD_MATCH")
 	if [ -z "$pids" ]; then
 		if [ "$withtap" -eq "1" ]; then
 			pass "No relay daemon to kill"
@@ -470,7 +460,7 @@ function stop_lttng_relayd_opt()
 	else
 		out=1
 		while [ -n "$out" ]; do
-			out=$(pgrep "$RELAYD_MATCH")
+			out=$(pgrep -f "$RELAYD_MATCH")
 			if [ -n "$dtimeleft_s" ]; then
 				if [ $dtimeleft_s -lt 0 ]; then
 					out=
@@ -548,7 +538,7 @@ function start_lttng_sessiond_opt()
 	: "${LTTNG_SESSION_CONFIG_XSD_PATH="${DIR}/../src/common/config/"}"
 	export LTTNG_SESSION_CONFIG_XSD_PATH
 
-	if [ -z "$(pgrep "${SESSIOND_MATCH}")" ]; then
+	if [ -z "$(pgrep -f "${SESSIOND_MATCH}")" ]; then
 		# Have a load path ?
 		if [ -n "$load_path" ]; then
 			# shellcheck disable=SC2086
@@ -600,10 +590,10 @@ function stop_lttng_sessiond_opt()
 	local retval=0
 
 	local runas_pids=
-	runas_pids=$(pgrep "$RUNAS_MATCH")
+	runas_pids=$(pgrep -f "$RUNAS_MATCH")
 
 	local pids=
-	pids=$(pgrep "$SESSIOND_MATCH")
+	pids=$(pgrep -f "$SESSIOND_MATCH")
 
 	if [ -n "$runas_pids" ]; then
 		pids="$pids $runas_pids"
@@ -627,7 +617,7 @@ function stop_lttng_sessiond_opt()
 	else
 		out=1
 		while [ -n "$out" ]; do
-			out=$(pgrep "${SESSIOND_MATCH}")
+			out=$(pgrep -f "${SESSIOND_MATCH}")
 			if [ -n "$dtimeleft_s" ]; then
 				if [ $dtimeleft_s -lt 0 ]; then
 					out=
@@ -639,7 +629,7 @@ function stop_lttng_sessiond_opt()
 		done
 		out=1
 		while [ -n "$out" ]; do
-			out=$(pgrep "$CONSUMERD_MATCH")
+			out=$(pgrep -f "$CONSUMERD_MATCH")
 			if [ -n "$dtimeleft_s" ]; then
 				if [ $dtimeleft_s -lt 0 ]; then
 					out=
@@ -693,7 +683,7 @@ function sigstop_lttng_sessiond_opt()
 		return
 	fi
 
-	PID_SESSIOND="$(pgrep "${SESSIOND_MATCH}") $(pgrep "$RUNAS_MATCH")"
+	PID_SESSIOND="$(pgrep -f "${SESSIOND_MATCH}") $(pgrep -f "$RUNAS_MATCH")"
 
 	if [ "$withtap" -eq "1" ]; then
 		diag "Sending SIGSTOP to lt-$SESSIOND_BIN and $SESSIOND_BIN pids: $(echo "$PID_SESSIOND" | tr '\n' ' ')"
@@ -707,7 +697,7 @@ function sigstop_lttng_sessiond_opt()
 	else
 		out=1
 		while [ $out -ne 0 ]; do
-			pid="$(pgrep "$SESSIOND_MATCH")"
+			pid="$(pgrep -f "$SESSIOND_MATCH")"
 
 			# Wait until state becomes stopped for session
 			# daemon(s).
@@ -755,7 +745,7 @@ function stop_lttng_consumerd_opt()
 
 	local retval=0
 
-	PID_CONSUMERD="$(pgrep "$CONSUMERD_MATCH")"
+	PID_CONSUMERD="$(pgrep -f "$CONSUMERD_MATCH")"
 
 	if [ -z "$PID_CONSUMERD" ]; then
 		if [ "$withtap" -eq "1" ]; then
@@ -775,7 +765,7 @@ function stop_lttng_consumerd_opt()
 	else
 		out=1
 		while [ $out -ne 0 ]; do
-			pid="$(pgrep "$CONSUMERD_MATCH")"
+			pid="$(pgrep -f "$CONSUMERD_MATCH")"
 
 			# If consumerds are still present check their status.
 			# A zombie status qualifies the consumerd as *killed*
@@ -822,7 +812,7 @@ function sigstop_lttng_consumerd_opt()
 	local withtap=$1
 	local signal=SIGSTOP
 
-	PID_CONSUMERD="$(pgrep "$CONSUMERD_MATCH")"
+	PID_CONSUMERD="$(pgrep -f "$CONSUMERD_MATCH")"
 
 	diag "Sending SIGSTOP to $CONSUMERD_BIN pids: $(echo "$PID_CONSUMERD" | tr '\n' ' ')"
 
@@ -838,7 +828,7 @@ function sigstop_lttng_consumerd_opt()
 	else
 		out=1
 		while [ $out -ne 0 ]; do
-			pid="$(pgrep "$CONSUMERD_MATCH")"
+			pid="$(pgrep -f "$CONSUMERD_MATCH")"
 
 			# Wait until state becomes stopped for all
 			# consumers.
@@ -1469,6 +1459,7 @@ function lttng_load_fail()
 function lttng_track()
 {
 	local expected_to_fail="$1"
+	shift 1
 	local opts="$@"
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN track $opts >$OUTPUT_DEST
 	ret=$?
@@ -1493,6 +1484,7 @@ function lttng_track_fail()
 function lttng_untrack()
 {
 	local expected_to_fail="$1"
+	shift 1
 	local opts="$@"
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN untrack $opts >$OUTPUT_DEST
 	ret=$?