X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=4f4cfc951c3b5f4c21f12688b117330a45d2cc24;hp=be83e73a622637812feb51fe3ff35d99029fc48a;hb=1d4b59f247e2692bf1e9c3c0aac93a47389d20dd;hpb=6ac56bb9dd3adec203a6c689e37ea43f6f3ac19b diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index be83e73a6..4f4cfc951 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 @@ -2198,7 +2198,7 @@ function lttng_add_trigger() local trigger_name="$2" shift 2 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --id "$trigger_name" "$@" 1> /dev/null 2> /dev/null + $TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --name "$trigger_name" "$@" 1> /dev/null 2> /dev/null ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" @@ -2212,8 +2212,9 @@ 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 + $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"