X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=2f5ed60e88222f276a8817b14445ad794e7f541d;hb=331731aa31dbd587ebd54e32c7f6c136f34aef7e;hp=f15d6d85069bd5d9596746426aad216dbadc5ab0;hpb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f15d6d85..2f5ed60e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,40 +1,112 @@
-SUBDIRS = utils bin lib bindings
+SUBDIRS = utils lib ctf-writer plugins
 
-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+# Directories added to EXTRA_DIST will be recursively copied to the distribution.
+EXTRA_DIST = $(srcdir)/ctf-traces \
+	     $(srcdir)/debug-info-data \
+	     bindings/python/bt2/.coveragerc
 
-TESTS = bin/test_trace_read \
-	bin/test_trace_read \
-	bin/test_packet_seq_num \
-	bin/test_convert_args \
-	bin/intersection/test_intersection \
+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 \
+	bindings/python/bt2/test_connection.py \
+	bindings/python/bt2/test_ctf_writer_clock.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_message_iterator.py \
+	bindings/python/bt2/test_message.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 \
+	python-plugin-provider/bt_plugin_test_python_plugin_provider.py \
+	python-plugin-provider/test_python_plugin_provider.py
+
+TESTS_BINDINGS =
+
+if ENABLE_PYTHON_BINDINGS
+TESTS_BINDINGS += bindings/python/bt2/test_python_bt2
+endif
+
+TESTS_CLI = \
+	cli/test_trace_read \
+	cli/test_packet_seq_num \
+	cli/test_convert_args \
+	cli/test_intersection \
+	cli/test_trace_copy \
+	cli/test_trimmer
+
+TESTS_LIB = \
 	lib/test_bitfield \
-	lib/test_seek_empty_packet \
-	lib/test_seek_big_trace \
-	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_trace_listener \
-	lib/test_bt_notification_heap \
-	lib/test_plugin_complete \
 	lib/test_graph_topo \
-	lib/test_cc_prio_map
+	lib/test_trace_ir_ref
+
+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
+endif
+
+TESTS_PLUGINS =
 
-EXTRA_DIST = $(srcdir)/ctf-traces/** \
-	     $(srcdir)/debug-info-data/** \
-	     $(srcdir)/debug-info-data/.build-id/cd/**
+if !ENABLE_BUILT_IN_PLUGINS
+if ENABLE_PYTHON_BINDINGS
+TESTS_PLUGINS += plugins/ctf/test_ctf_plugin
 
 if ENABLE_DEBUG_INFO
-TESTS += lib/test_dwarf_complete \
-	lib/test_bin_info_complete
+TESTS_PLUGINS += plugins/test_lttng_utils_debug_info
+endif
+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
 endif
 
-if USE_PYTHON
-TESTS += bin/intersection/test_multi_trace_intersection.py \
-	lib/writer/test_ctf_writer_no_packet_context.py \
-	lib/writer/test_ctf_writer_empty_packet.py \
-	bindings/python/bt2/testall.sh
+TESTS_PYTHON_PLUGIN_PROVIDER =
+
+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)
+
+define check_target
+check-$(1):
+	$(MAKE) $(AM_MAKEFLAGS) TESTS="$2" check
+endef
+
+$(eval $(call check_target,bindings,$(TESTS_BINDINGS)))
+$(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)))