X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=11b932c8094a78426b9e490a35e697e88e9e8f1a;hb=b7fa35fce415b33207a9eba111069ed31ef122a0;hp=2f5ed60e88222f276a8817b14445ad794e7f541d;hpb=e40bd1f0775d3d9f84ceb15909cc8002134c2abb;p=babeltrace.git diff --git a/tests/Makefile.am b/tests/Makefile.am index 2f5ed60e..11b932c8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,17 @@ -SUBDIRS = utils lib ctf-writer plugins +SUBDIRS = \ + utils \ + lib \ + bitfield \ + ctf-writer \ + plugins \ + argpar \ + param-validation # Directories added to EXTRA_DIST will be recursively copied to the distribution. -EXTRA_DIST = $(srcdir)/ctf-traces \ - $(srcdir)/debug-info-data \ +EXTRA_DIST = $(srcdir)/data \ bindings/python/bt2/.coveragerc dist_check_SCRIPTS = \ - bindings/python/bt2/test_clock_class_priority_map.py \ bindings/python/bt2/test_clock_class.py \ bindings/python/bt2/test_component_class.py \ bindings/python/bt2/test_component.py \ @@ -17,11 +22,15 @@ dist_check_SCRIPTS = \ bindings/python/bt2/test_field_class.py \ bindings/python/bt2/test_field.py \ bindings/python/bt2/test_graph.py \ + bindings/python/bt2/test_integer_range_set.py \ + bindings/python/bt2/test_interrupter.py \ bindings/python/bt2/test_message_iterator.py \ bindings/python/bt2/test_message.py \ + bindings/python/bt2/test_package.py \ bindings/python/bt2/test_packet.py \ bindings/python/bt2/test_plugin.py \ bindings/python/bt2/test_port.py \ + bindings/python/bt2/test_python_bt2 \ bindings/python/bt2/test_query_executor.py \ bindings/python/bt2/test_stream_class.py \ bindings/python/bt2/test_stream.py \ @@ -29,7 +38,22 @@ dist_check_SCRIPTS = \ bindings/python/bt2/test_trace.py \ bindings/python/bt2/test_value.py \ bindings/python/bt2/utils.py \ + cli/convert/test_auto_source_discovery_grouping \ + cli/convert/test_auto_source_discovery_params \ + cli/convert/test_auto_source_discovery_log_level \ + cli/convert/test_convert_args \ + cli/test_help \ + cli/test_intersection \ + cli/test_output_ctf_metadata \ + cli/test_output_path_ctf_non_lttng_trace \ + cli/test_packet_seq_num \ + cli/test_trace_copy \ + cli/test_trace_read \ + cli/test_trimmer \ + plugins/sink.text.details/succeed/test_succeed \ + plugins/src.ctf.lttng-live/test_live \ python-plugin-provider/bt_plugin_test_python_plugin_provider.py \ + python-plugin-provider/test_python_plugin_provider \ python-plugin-provider/test_python_plugin_provider.py TESTS_BINDINGS = @@ -38,53 +62,78 @@ if ENABLE_PYTHON_BINDINGS TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 endif +TESTS_ARGPAR = \ + argpar/test_argpar + TESTS_CLI = \ - cli/test_trace_read \ - cli/test_packet_seq_num \ - cli/test_convert_args \ + cli/convert/test_convert_args \ + cli/test_help \ cli/test_intersection \ + cli/test_output_path_ctf_non_lttng_trace \ + cli/test_packet_seq_num \ cli/test_trace_copy \ + cli/test_trace_read \ cli/test_trimmer TESTS_LIB = \ - lib/test_bitfield \ lib/test_bt_values \ + lib/test_bt_uuid \ lib/test_graph_topo \ - lib/test_trace_ir_ref + lib/test_trace_ir_ref \ + lib/test_simple_sink + +TESTS_BITFIELD = \ + bitfield/test_bitfield TESTS_CTF_WRITER = \ ctf-writer/test_ctf_writer if !ENABLE_BUILT_IN_PLUGINS -TESTS_LIB += lib/test_plugin_complete -endif - -if ENABLE_PYTHON_BINDINGS -TESTS_LIB += lib/trace-ir/test_trace_ir +TESTS_LIB += lib/test_plugin endif -TESTS_PLUGINS = +TESTS_PLUGINS = \ + plugins/src.ctf.fs/succeed/test_succeed \ + plugins/sink.ctf.fs/succeed/test_succeed \ + plugins/sink.text.details/succeed/test_succeed if !ENABLE_BUILT_IN_PLUGINS if ENABLE_PYTHON_BINDINGS -TESTS_PLUGINS += plugins/ctf/test_ctf_plugin +TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query_support_info +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 -TESTS_PLUGINS += plugins/test_lttng_utils_debug_info -endif +TESTS_PLUGINS += \ + plugins/flt.lttng-utils.debug-info/test_succeed endif endif if ENABLE_DEBUG_INFO TESTS_PLUGINS += \ - plugins/test_dwarf_i386-linux-gnu \ - plugins/test_dwarf_powerpc-linux-gnu \ - plugins/test_dwarf_powerpc64le-linux-gnu \ - plugins/test_dwarf_x86_64-linux-gnu \ - plugins/test_bin_info_i386-linux-gnu \ - plugins/test_bin_info_powerpc-linux-gnu \ - plugins/test_bin_info_powerpc64le-linux-gnu \ - plugins/test_bin_info_x86_64-linux-gnu + plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu +endif + +if ENABLE_PYTHON_PLUGINS +if ENABLE_PYTHON_BINDINGS +TESTS_CLI += cli/convert/test_auto_source_discovery_grouping \ + cli/convert/test_auto_source_discovery_log_level \ + cli/convert/test_auto_source_discovery_params +TESTS_PLUGINS += plugins/flt.utils.trimmer/test_trimming \ + plugins/flt.utils.muxer/succeed/test_succeed +endif +endif + +if HAVE_PYTHON +TESTS_PLUGINS += plugins/src.ctf.lttng-live/test_live endif TESTS_PYTHON_PLUGIN_PROVIDER = @@ -93,20 +142,41 @@ if ENABLE_PYTHON_PLUGINS TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider endif -LOG_DRIVER_FLAGS = '--merge' -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh - -TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_CTF_WRITER) $(TESTS_LIB) \ - $(TESTS_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER) +LOG_DRIVER_FLAGS = --merge --comments +LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \ + BT_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \ + BT_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \ + BT_TESTS_AWK_BIN="$(AWK)" \ + BT_TESTS_GREP_BIN="$(GREP)" \ + BT_TESTS_PYTHON_BIN="$(PYTHON)" \ + BT_TESTS_PYTHON_CONFIG_BIN="$(PYTHON_CONFIG)" \ + BT_TESTS_SED_BIN="$(SED)" \ + $(SHELL) $(srcdir)/utils/tap-driver.sh + +TESTS_NO_BITFIELD = \ + $(TESTS_ARGPAR) \ + $(TESTS_BINDINGS) \ + $(TESTS_CLI) \ + $(TESTS_CTF_WRITER) \ + $(TESTS_LIB) \ + $(TESTS_PLUGINS) \ + $(TESTS_PYTHON_PLUGIN_PROVIDER) + +TESTS = $(TESTS_NO_BITFIELD) $(TESTS_BITFIELD) define check_target check-$(1): $(MAKE) $(AM_MAKEFLAGS) TESTS="$2" check endef +$(eval $(call check_target,argpar,$(TESTS_ARGPAR))) $(eval $(call check_target,bindings,$(TESTS_BINDINGS))) +$(eval $(call check_target,bitfield,$(TESTS_BITFIELD))) $(eval $(call check_target,cli,$(TESTS_CLI))) $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER))) $(eval $(call check_target,lib,$(TESTS_LIB))) $(eval $(call check_target,plugins,$(TESTS_PLUGINS))) $(eval $(call check_target,python-plugin-provider,$(TESTS_PYTHON_PLUGIN_PROVIDER))) + +check-no-bitfield: + $(MAKE) $(AM_MAKEFLAGS) TESTS="$(TESTS_NO_BITFIELD)" check