X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=af125c9814ca07ad7b7abd3dc105018f645c1b0d;hb=651dd74ddc4e98f443888d3afea237df85ca1b22;hp=be83e73a622637812feb51fe3ff35d99029fc48a;hpb=6ac56bb9dd3adec203a6c689e37ea43f6f3ac19b;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index be83e73a6..af125c981 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -2102,7 +2102,7 @@ function rotate_session_fail ()
 
 function destructive_tests_enabled ()
 {
-	if [ ${LTTNG_ENABLE_DESTRUCTIVE_TESTS} = "will-break-my-system" ]; then
+	if [ "$LTTNG_ENABLE_DESTRUCTIVE_TESTS" = "will-break-my-system" ]; then
 		return 0
 	else
 		return 1
@@ -2197,8 +2197,10 @@ function lttng_add_trigger()
 	local expected_to_fail="$1"
 	local trigger_name="$2"
 	shift 2
+	local args=("$@")
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --id "$trigger_name" "$@" 1> /dev/null 2> /dev/null
+	diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --name $trigger_name ${args[*]}"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --name "$trigger_name" "${args[@]}" 1> /dev/null 2> /dev/null
 	ret=$?
 	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
@@ -2212,8 +2214,10 @@ function lttng_remove_trigger()
 {
 	local expected_to_fail="$1"
 	local trigger_name="$2"
+	shift 2
 
-	$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"