X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=530a1062389a7f667fdf82732fd297ebf7bfcbdc;hb=fc2dd19e2c7dbeaa86654b47c0a2c221b7018ecf;hp=f3b4c68c1337720cc599cb534c5131d411bebe42;hpb=bd6661538d573c0798439f2933474f677a857728;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index f3b4c68c1..530a10623 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -1783,7 +1783,7 @@ function validate_metadata_event () local nr_event_id=$2 local trace_path=$3 - local metadata_file=$(find $trace_path | grep metadata) + local metadata_file=$(find $trace_path -name "metadata") local metadata_path=$(dirname $metadata_file) which $BABELTRACE_BIN >/dev/null @@ -2247,6 +2247,29 @@ function lttng_remove_trigger_ok() lttng_remove_trigger 0 "$@" } +function list_triggers_matches_ok () +{ + local tmp_stdout=$(mktemp -t test_list_triggers_cli_stdout.XXXXXX) + local tmp_stderr=$(mktemp -t test_list_triggers_cli_stderr.XXXXXX) + + local test_name="$1" + local expected_stdout_file="$2" + + diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN list-triggers" + + "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" list-triggers > "${tmp_stdout}" 2> "${tmp_stderr}" + ok $? "${test_name}: exit code is 0" + + diff -u "${expected_stdout_file}" "${tmp_stdout}" + ok $? "${test_name}: expected stdout" + + diff -u /dev/null "${tmp_stderr}" + ok $? "${test_name}: expected stderr" + + rm -f "${tmp_stdout}" + rm -f "${tmp_stderr}" +} + function validate_path_pattern () { local message=$1