From 5177c3519afdc36b0948209c73f1d0719a9a3eb0 Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Thu, 15 Jun 2017 13:48:48 -0400 Subject: [PATCH] Test: validate that the output of ctf-fs sink is identical to source MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Process all the "succeed" CTF traces with the CTF-FS sink, check the return code of babeltrace and compare the number of events in the new trace from the number of events in the source trace. Signed-off-by: Julien Desfossez Signed-off-by: Jérémie Galarneau --- .gitignore | 1 + configure.ac | 1 + tests/cli/Makefile.am | 5 ++-- tests/cli/test_trace_copy.in | 52 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 tests/cli/test_trace_copy.in diff --git a/.gitignore b/.gitignore index f9af7c55..d7a49b12 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /tests/cli/intersection/test_intersection /tests/cli/test_packet_seq_num /tests/cli/test_trace_read +/tests/cli/test_trace_copy /tests/cli/test_convert_args /tests/bin/intersection/bt_python_helper.py /tests/bin/intersection/test_intersection diff --git a/configure.ac b/configure.ac index b6ba0fe2..323afa75 100644 --- a/configure.ac +++ b/configure.ac @@ -541,6 +541,7 @@ AC_CONFIG_FILES([tests/lib/test_bin_info_complete], [chmod +x tests/lib/test_bin AC_CONFIG_FILES([tests/plugins/test-utils-muxer-complete], [chmod +x tests/plugins/test-utils-muxer-complete]) AC_CONFIG_FILES([tests/cli/test_trace_read], [chmod +x tests/cli/test_trace_read]) +AC_CONFIG_FILES([tests/cli/test_trace_copy], [chmod +x tests/cli/test_trace_copy]) AC_CONFIG_FILES([tests/cli/intersection/test_intersection], [chmod +x tests/cli/intersection/test_intersection]) AC_CONFIG_FILES([tests/cli/test_convert_args], [chmod +x tests/cli/test_convert_args]) AC_CONFIG_FILES([tests/cli/intersection/bt_python_helper.py]) diff --git a/tests/cli/Makefile.am b/tests/cli/Makefile.am index b123ed01..27e67dfa 100644 --- a/tests/cli/Makefile.am +++ b/tests/cli/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = intersection -check_SCRIPTS = test_trace_read test_packet_seq_num test_convert_args +check_SCRIPTS = test_trace_read test_packet_seq_num test_convert_args test_trace_copy LOG_DRIVER_FLAGS='--merge' LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh @@ -7,7 +7,8 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh TESTS = test_trace_read \ test_packet_seq_num \ test_convert_args \ - intersection/test_intersection + intersection/test_intersection \ + test_trace_copy if USE_PYTHON TESTS += intersection/test_multi_trace_intersection.py diff --git a/tests/cli/test_trace_copy.in b/tests/cli/test_trace_copy.in new file mode 100644 index 00000000..b2de187e --- /dev/null +++ b/tests/cli/test_trace_copy.in @@ -0,0 +1,52 @@ +#!/bin/bash +# +# Copyright (C) - 2017 Julien Desfossez +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License, version 2 only, as +# published by the Free Software Foundation. +# +# 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., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +CURDIR=$(dirname $0) +TESTDIR=$CURDIR/.. + +BABELTRACE_BIN=$CURDIR/../../cli/babeltrace + +CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces + +source $TESTDIR/utils/tap/tap.sh + +SUCCESS_TRACES=(${CTF_TRACES}/succeed/*) +FAIL_TRACES=(${CTF_TRACES}/fail/*) + +NUM_TESTS=$((${#SUCCESS_TRACES[@]} * 3)) + +plan_tests $NUM_TESTS + +for path in ${SUCCESS_TRACES[@]}; do + out_path=$(mktemp -d) + trace=$(basename ${path}) + + orig_cnt=$($BABELTRACE_BIN ${path} 2>/dev/null | wc -l) + + $BABELTRACE_BIN ${path} --component sink.ctf.fs --path ${out_path} >/dev/null 2>&1 + ok $? "Copy trace ${trace} with ctf-fs sink" + + $BABELTRACE_BIN ${out_path} >/dev/null 2>&1 + ok $? "Read the new trace in ${out_path}" + + new_cnt=$($BABELTRACE_BIN ${out_path} 2>/dev/null | wc -l) + + test $orig_cnt == $new_cnt + ok $? "Same number of events as the original trace ($orig_cnt -> $new_cnt)" + + rm -rf ${out_path} +done -- 2.34.1