X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=9db0640b70f3135bdfc156340393eec3fb4ea043;hb=ed6cc57653b5e16ae3702e5157429e2209f9d088;hp=8e40407aa615de3bd41f2f903bb6e6a4ecb8091a;hpb=651b8bb3adfa890b2acdc2903e2f2456d59b7a58;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 8e40407aa..9db0640b7 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -1,5 +1,3 @@ -#!/src/bin/bash -# # Copyright (C) - 2012 David Goulet # # This library is free software; you can redistribute it and/or modify it under @@ -1139,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()