From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 5 May 2021 17:34:00 +0000 (-0400)
Subject: Fix: tests: extra arguments are not passed to the remove trigger command
X-Git-Tag: v2.13.0-rc2~37
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=cd46061a32b73d2986a12b396ac2c74c6b6c0ade;p=lttng-tools.git

Fix: tests: extra arguments are not passed to the remove trigger command

Observed issue
==============
CI root jobs fails on the remove trigger operation for the user_trigger
trigger during the test_ust_notifier_discarded_count_multi_uid test.

Cause
=====
The `--owner uid` option and its argument are not passed during the
command execution.

Solution
========
Pass all extra parameters for the command execution.

Known drawbacks
=========

None.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ic7b5d46b6793cda16a474c5459f9bf533812fe61
---

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 6a9e1891d..af125c981 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -2216,8 +2216,8 @@ function lttng_remove_trigger()
 	local trigger_name="$2"
 	shift 2
 
-	diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN remove-trigger $trigger_name"
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN remove-trigger "$trigger_name" 1> /dev/null 2> /dev/null
+	diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN remove-trigger $trigger_name $*"
+	"$TESTDIR/../src/bin/lttng/$LTTNG_BIN" remove-trigger "$trigger_name" "$@" 1> /dev/null 2> /dev/null
 	ret=$?
 	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"