From 651dd74ddc4e98f443888d3afea237df85ca1b22 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 5 May 2021 13:34:00 -0400 Subject: [PATCH] Fix: tests: extra arguments are not passed to the remove trigger command MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jérémie Galarneau Change-Id: Ic7b5d46b6793cda16a474c5459f9bf533812fe61 --- tests/utils/utils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- 2.34.1