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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4a5ef559..2f5ed60e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,42 +1,66 @@
-SUBDIRS = utils cli lib bindings plugins
+SUBDIRS = utils lib ctf-writer plugins
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/ctf-traces \
-	     $(srcdir)/debug-info-data
+	     $(srcdir)/debug-info-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 \
+	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_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
 endif
 
 TESTS_CLI = \
 	cli/test_trace_read \
 	cli/test_packet_seq_num \
 	cli/test_convert_args \
-	cli/intersection/test_intersection \
+	cli/test_intersection \
 	cli/test_trace_copy \
 	cli/test_trimmer
 
 TESTS_LIB = \
 	lib/test_bitfield \
 	lib/test_bt_values \
-	lib/test_ctf_writer_complete \
 	lib/test_graph_topo \
 	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
-TESTS_LIB += lib/ctf-writer/test_ctf_writer
 endif
 
 TESTS_PLUGINS =
@@ -72,7 +96,7 @@ 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_LIB) \
+TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_CTF_WRITER) $(TESTS_LIB) \
 	$(TESTS_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER)
 
 define check_target
@@ -82,6 +106,7 @@ 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)))