From: Francis Deslauriers Date: Fri, 16 Aug 2019 15:43:58 +0000 (-0400) Subject: Tests: ctf: add basic `metadata-info` query test X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b34bfe00485f1ab1247da145b0a1620bf698328e Tests: ctf: add basic `metadata-info` query test Signed-off-by: Francis Deslauriers Change-Id: I1dcd08a024581a078c163cb09a3372bf2a7ce35f Reviewed-on: https://review.lttng.org/c/babeltrace/+/1955 Tested-by: jenkins Reviewed-by: Philippe Proulx --- diff --git a/tests/Makefile.am b/tests/Makefile.am index 20da4048..4951ee6c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -85,7 +85,8 @@ TESTS_PLUGINS = \ if !ENABLE_BUILT_IN_PLUGINS if ENABLE_PYTHON_BINDINGS -TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query +TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query_trace_info +TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query_metadata_info endif if ENABLE_DEBUG_INFO diff --git a/tests/data/plugins/src.ctf.fs/query/metadata-info-succeed1.expect b/tests/data/plugins/src.ctf.fs/query/metadata-info-succeed1.expect new file mode 100644 index 00000000..7a3adb87 --- /dev/null +++ b/tests/data/plugins/src.ctf.fs/query/metadata-info-succeed1.expect @@ -0,0 +1,28 @@ +text: /* CTF 1.8 */ +typealias integer { size = 8; align = 8; signed = false; } := uint8_t; +typealias integer { size = 32; align = 32; signed = false; } := uint32_t; + +trace { + major = 1; + minor = 8; + uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; + byte_order = le; + packet.header := struct { + uint32_t magic; + uint8_t uuid[16]; + }; +}; + +stream { + packet.context := struct { + uint32_t content_size; + uint32_t packet_size; + }; +}; + +event { + name = string; + fields := struct { string str; }; +}; + +is-packetized: no diff --git a/tests/plugins/src.ctf.fs/Makefile.am b/tests/plugins/src.ctf.fs/Makefile.am index 73571141..57903cf6 100644 --- a/tests/plugins/src.ctf.fs/Makefile.am +++ b/tests/plugins/src.ctf.fs/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = succeed dist_check_SCRIPTS = \ - query/test_query \ + query/test_query_metadata_info \ + query/test_query_trace_info \ query/test_query_trace_info.py diff --git a/tests/plugins/src.ctf.fs/query/test_query b/tests/plugins/src.ctf.fs/query/test_query deleted file mode 100755 index 4ab85cc7..00000000 --- a/tests/plugins/src.ctf.fs/query/test_query +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2019 Simon Marchi -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; only version 2 -# of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then - UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" -else - UTILSSH="$(dirname "$0")/../../../utils/utils.sh" -fi - -# shellcheck source=../../../utils/utils.sh -source "$UTILSSH" - -run_python_bt2_test "${BT_TESTS_SRCDIR}/plugins/src.ctf.fs/query" test_query* diff --git a/tests/plugins/src.ctf.fs/query/test_query_metadata_info b/tests/plugins/src.ctf.fs/query/test_query_metadata_info new file mode 100755 index 00000000..e52e7fa0 --- /dev/null +++ b/tests/plugins/src.ctf.fs/query/test_query_metadata_info @@ -0,0 +1,63 @@ +#!/bin/bash +# +# Copyright (C) 2019 Simon Marchi +# Copyright (C) 2019 Francis Deslauriers +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; only version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +SH_TAP=1 + +if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then + UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" +else + UTILSSH="$(dirname "$0")/../../../utils/utils.sh" +fi + +# shellcheck source=../../../utils/utils.sh +source "$UTILSSH" + +this_dir_relative="plugins/src.ctf.fs/query" +this_dir_build="$BT_TESTS_BUILDDIR/$this_dir_relative" +succeed_trace_dir="$BT_CTF_TRACES_PATH/succeed" +expect_dir="$BT_TESTS_DATADIR/$this_dir_relative" + +test_query_metadata_info() { + local name="$1" + local ret=0 + local trace_path="$succeed_trace_dir/$name" + local expected_stdout="$expect_dir/metadata-info-$name.expect" + local temp_stdout_output_file="$(mktemp -t actual_stdout.XXXXXX)" + local temp_stderr_output_file="$(mktemp -t actual_stderr.XXXXXX)" + local query=("query" "src.ctf.fs" "metadata-info" "--params" "path=\"$trace_path\"") + + bt_cli "$temp_stdout_output_file" "$temp_stderr_output_file" \ + "${query[@]}" + + bt_diff "$expected_stdout" "$temp_stdout_output_file" + ret_stdout=$? + + bt_diff /dev/null "$temp_stderr_output_file" + ret_stderr=$? + + if ((ret_stdout != 0 || ret_stderr != 0)); then + ret=1 + fi + + ok $ret "Trace '$name' \`metadata-info\` query gives the expected output" + rm -f "$temp_stdout_output_file" "$temp_stderr_output_file" +} + +plan_tests 1 +test_query_metadata_info succeed1 diff --git a/tests/plugins/src.ctf.fs/query/test_query_trace_info b/tests/plugins/src.ctf.fs/query/test_query_trace_info new file mode 100755 index 00000000..8d848872 --- /dev/null +++ b/tests/plugins/src.ctf.fs/query/test_query_trace_info @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Copyright (C) 2019 Simon Marchi +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; only version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then + UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" +else + UTILSSH="$(dirname "$0")/../../../utils/utils.sh" +fi + +# shellcheck source=../../../utils/utils.sh +source "$UTILSSH" + +run_python_bt2_test "${BT_TESTS_SRCDIR}/plugins/src.ctf.fs/query" test_query_trace_info.py