X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;fp=tests%2Futils%2Futils.sh;h=34cbb82b5aaac225f775f1aec8ab111713dfa39d;hb=1e8a3a7ff0e48bec9da02b6fdc7a5d31b36fa168;hp=c56a8aa2855d5c63bce73d5fc71514553d389fed;hpb=92f8fa637809b6f478bdabf291d030ba9fc2fe48;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index c56a8aa28..34cbb82b5 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -1137,10 +1137,27 @@ function lttng_save() function lttng_load() { - local opts=$1 + local expected_to_fail=$1 + local opts=$2 $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST - ok $? "Load command with opts: $opts" + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test $ret -ne "0" + ok $? "Load command failed as expected with opts: $opts" + else + ok $ret "Load command with opts: $opts" + fi +} + +function lttng_load_ok() +{ + lttng_load 0 "$@" +} + +function lttng_load_fail() +{ + lttng_load 1 "$@" } function lttng_track()