X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=c81cc2d1adb133f873b203116e438eed33af6fd7;hb=96bb1ae87edd50f631cc845c76ca08cedae8c59f;hp=be83e73a622637812feb51fe3ff35d99029fc48a;hpb=6ac56bb9dd3adec203a6c689e37ea43f6f3ac19b;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index be83e73a6..c81cc2d1a 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 @@ -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"