X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2FMakefile.am;h=a9200a0c687c53b726ec0f73edce8db68555839c;hb=3d925cc0103eab59d361925c00442d6178d2e536;hp=a0d9dcc28fc9f48922da8ea68a07aa55a8edac5f;hpb=1805e0b4b91b339a131f2463e241b706cad5a56f;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a0d9dcc2..a9200a0c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,77 +1,211 @@
-SUBDIRS = utils cli lib bindings plugins
-
-EXTRA_DIST = $(srcdir)/ctf-traces/** \
-	     $(srcdir)/debug-info-data/** \
-	     $(srcdir)/debug-info-data/.build-id/cd/**
+# SPDX-License-Identifier: MIT
+
+SUBDIRS = \
+	utils \
+	lib \
+	bitfield \
+	ctf-writer \
+	plugins \
+	param-validation
+
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
+
+COMMON_TEST_LDADD = \
+	$(top_builddir)/tests/utils/tap/libtap.la \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/logging/liblogging.la
+
+# Directories added to EXTRA_DIST will be recursively copied to the distribution.
+EXTRA_DIST = $(srcdir)/data \
+	     bindings/python/bt2/.coveragerc
+
+dist_check_SCRIPTS = \
+	bindings/python/bt2/test-python-bt2.sh \
+	bindings/python/bt2/test_clock_class.py \
+	bindings/python/bt2/test_component_class.py \
+	bindings/python/bt2/test_component.py \
+	bindings/python/bt2/test_connection.py \
+	bindings/python/bt2/test_event_class.py \
+	bindings/python/bt2/test_event.py \
+	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_query_executor.py \
+	bindings/python/bt2/test_stream_class.py \
+	bindings/python/bt2/test_stream.py \
+	bindings/python/bt2/test_trace_collection_message_iterator.py \
+	bindings/python/bt2/test_trace.py \
+	bindings/python/bt2/test_value.py \
+	bindings/python/bt2/utils.py \
+	cli/convert/test-auto-source-discovery-grouping.sh \
+	cli/convert/test-auto-source-discovery-params.sh \
+	cli/convert/test-auto-source-discovery-log-level.sh \
+	cli/convert/test-convert-args.sh \
+	cli/list-plugins/test-list-plugins.sh \
+	cli/params/test-params.sh \
+	cli/query/test-query.sh \
+	cli/test-exit-status.sh \
+	cli/test-help.sh \
+	cli/test-intersection.sh \
+	cli/test-output-ctf-metadata.sh \
+	cli/test-output-path-ctf-non-lttng-trace.sh \
+	cli/test-packet-seq-num.sh \
+	cli/test-trace-copy.sh \
+	cli/test-trace-read.sh \
+	cli/test-trimmer.sh \
+	plugins/sink.text.details/succeed/test-succeed.sh \
+	plugins/sink.text.pretty/test-enum.sh \
+	plugins/sink.text.pretty/test_pretty.py \
+	plugins/sink.text.pretty/test-pretty-python.sh \
+	plugins/src.ctf.lttng-live/test-live.sh \
+	python-plugin-provider/bt_plugin_test_python_plugin_provider.py \
+	python-plugin-provider/test-python-plugin-provider.sh \
+	python-plugin-provider/test_python_plugin_provider.py
+
+noinst_PROGRAMS =
 
 TESTS_BINDINGS =
 
-if ENABLE_PYTHON_PLUGINS
-SUBDIRS += python-plugin-provider
-endif
-
 if ENABLE_PYTHON_BINDINGS
-TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 \
-	bindings/python/babeltrace/test_python_babeltrace
+TESTS_BINDINGS += bindings/python/bt2/test-python-bt2.sh
 endif
 
 TESTS_CLI = \
-	cli/test_trace_read \
-	cli/test_packet_seq_num \
-	cli/test_convert_args \
-	cli/intersection/test_intersection \
-	cli/test_trace_copy \
-	cli/test_trimmer
+	cli/convert/test-convert-args.sh \
+	cli/test-help.sh \
+	cli/test-intersection.sh \
+	cli/test-output-ctf-metadata.sh \
+	cli/test-output-path-ctf-non-lttng-trace.sh \
+	cli/test-packet-seq-num.sh \
+	cli/test-trace-copy.sh \
+	cli/test-trace-read.sh \
+	cli/test-trimmer.sh
+
+noinst_PROGRAMS += \
+	cpp-common/test-c-string-view
+
+cpp_common_test_c_string_view_SOURCES = \
+	cpp-common/test-c-string-view.cpp
+
+cpp_common_test_c_string_view_LDADD = \
+	$(COMMON_TEST_LDADD)
+
+TESTS_CPP_COMMON = \
+	cpp-common/test-c-string-view
 
 TESTS_LIB = \
-	lib/test_bitfield \
-	lib/test_ctf_writer_complete \
-	lib/test_bt_values \
-	lib/test_ctf_ir_ref \
-	lib/test_bt_ctf_field_type_validation \
-	lib/test_ir_visit \
-	lib/test_bt_notification_heap \
-	lib/test_graph_topo \
-	lib/test_cc_prio_map \
-	lib/test_bt_notification_iterator
+	lib/test-bt-uuid \
+	lib/test-bt-values \
+	lib/test-fields.sh \
+	lib/test-graph-topo \
+	lib/test-remove-destruction-listener-in-destruction-listener \
+	lib/test-simple-sink \
+	lib/test-trace-ir-ref
 
-if !ENABLE_BUILT_IN_PLUGINS
-TESTS_LIB += lib/test_plugin_complete
-endif
+TESTS_BITFIELD = \
+	bitfield/test-bitfield
 
-if ENABLE_PYTHON_BINDINGS
-TESTS_LIB += lib/ctf-ir/test_ctf_ir
+TESTS_CTF_WRITER = \
+	ctf-writer/test-ctf-writer.sh
+
+if !ENABLE_BUILT_IN_PLUGINS
+TESTS_LIB += lib/test-plugins.sh
 endif
 
-TESTS_PLUGINS =
+TESTS_PLUGINS = \
+	plugins/src.ctf.fs/fail/test-fail.sh \
+	plugins/src.ctf.fs/succeed/test-succeed.sh \
+	plugins/src.ctf.fs/test-deterministic-ordering.sh \
+	plugins/sink.ctf.fs/succeed/test-succeed.sh \
+	plugins/sink.text.details/succeed/test-succeed.sh
 
 if !ENABLE_BUILT_IN_PLUGINS
-TESTS_PLUGINS += plugins/test-utils-muxer-complete
-
-if ENABLE_DEBUG_INFO
 if ENABLE_PYTHON_BINDINGS
-TESTS_PLUGINS += plugins/test_lttng_utils_debug_info
-endif
+TESTS_PLUGINS += plugins/src.ctf.fs/query/test-query-support-info.sh
+TESTS_PLUGINS += plugins/src.ctf.fs/query/test-query-trace-info.sh
+TESTS_PLUGINS += plugins/src.ctf.fs/query/test-query-metadata-info.sh
+TESTS_PLUGINS += plugins/sink.ctf.fs/test-assume-single-trace.sh
+TESTS_PLUGINS += plugins/sink.ctf.fs/test-stream-names.sh
 endif
 endif
 
 if ENABLE_DEBUG_INFO
 TESTS_PLUGINS += \
-	plugins/test_dwarf_complete \
-	plugins/test_bin_info_complete
+	plugins/flt.lttng-utils.debug-info/test-dwarf-i386-linux-gnu.sh \
+	plugins/flt.lttng-utils.debug-info/test-dwarf-powerpc-linux-gnu.sh \
+	plugins/flt.lttng-utils.debug-info/test-dwarf-powerpc64le-linux-gnu.sh \
+	plugins/flt.lttng-utils.debug-info/test-dwarf-x86-64-linux-gnu.sh \
+	plugins/flt.lttng-utils.debug-info/test-bin-info-i386-linux-gnu.sh \
+	plugins/flt.lttng-utils.debug-info/test-bin-info-powerpc-linux-gnu.sh \
+	plugins/flt.lttng-utils.debug-info/test-bin-info-powerpc64le-linux-gnu.sh \
+	plugins/flt.lttng-utils.debug-info/test-bin-info-x86-64-linux-gnu.sh
+endif
+
+if ENABLE_PYTHON_PLUGINS
+if ENABLE_PYTHON_BINDINGS
+TESTS_CLI += \
+	cli/convert/test-auto-source-discovery-grouping.sh \
+	cli/convert/test-auto-source-discovery-log-level.sh \
+	cli/convert/test-auto-source-discovery-params.sh \
+	cli/list-plugins/test-list-plugins.sh \
+	cli/params/test-params.sh \
+	cli/query/test-query.sh \
+	cli/test-exit-status.sh
+
+TESTS_PLUGINS += plugins/flt.utils.trimmer/test-trimming.sh \
+	plugins/flt.utils.muxer/succeed/test-succeed.sh \
+	plugins/sink.text.pretty/test-enum.sh \
+	plugins/src.ctf.fs/field/test-field.sh
+endif
+endif
+
+if HAVE_PYTHON
+TESTS_PLUGINS += plugins/src.ctf.lttng-live/test-live.sh
+
+if DEV_MODE
+TESTS_LIB += lib/conds/test-conds.sh
+endif
 endif
 
 TESTS_PYTHON_PLUGIN_PROVIDER =
 
 if ENABLE_PYTHON_PLUGINS
-TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
+TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test-python-plugin-provider.sh
+TESTS_PLUGINS += plugins/sink.text.pretty/test-pretty-python.sh
+if ENABLE_DEBUG_INFO
+TESTS_PLUGINS += \
+	plugins/flt.lttng-utils.debug-info/test-succeed.sh
+endif
 endif
 
-LOG_DRIVER_FLAGS = '--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
+TESTS_PARAM_VALIDATION = \
+	param-validation/test-param-validation
 
-TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(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' \
+	     $(SHELL) $(srcdir)/utils/tap-driver.sh
+
+TESTS_NO_BITFIELD = \
+	$(TESTS_BINDINGS) \
+	$(TESTS_CLI) \
+	$(TESTS_CPP_COMMON) \
+	$(TESTS_CTF_WRITER) \
+	$(TESTS_LIB) \
+	$(TESTS_PARAM_VALIDATION) \
+	$(TESTS_PLUGINS) \
+	$(TESTS_PYTHON_PLUGIN_PROVIDER)
+
+TESTS = $(TESTS_NO_BITFIELD) $(TESTS_BITFIELD)
 
 define check_target
 check-$(1):
@@ -79,7 +213,13 @@ check-$(1):
 endef
 
 $(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,cpp-common,$(TESTS_CPP_COMMON)))
+$(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