lttng add-trigger: some updates to event rule to new syntax

[lttng-tools.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index d57cb3f344192e0c7e730d07a8c6c21b4a646c69..6a9e1891d266cd890833feeec249d972ea97d772 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -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,7 +2214,9 @@ function lttng_remove_trigger()
 {
        local expected_to_fail="$1"
        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
        ret=$?
        if [[ $expected_to_fail -eq "1" ]]; then