X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=88dce23a0db44cfec148cff068b50931e5e82887;hb=71fd6f526fb8958500f72b97ce675f25a4284923;hp=796334ffaa616553a6dd765417fddc17ee1d4f5c;hpb=cd1c5347f7583a20ece5a1a62fc0e0eddb82322b;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 796334ff..88dce23a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,11 @@ TESTS_BINDINGS =
 
 if ENABLE_PYTHON_PLUGINS
 SUBDIRS += python-plugin-provider
-TESTS_BINDINGS += bindings/python/bt2/test_python_bt2
+endif
+
+if ENABLE_PYTHON_BINDINGS
+TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 \
+	bindings/python/babeltrace/test_python_babeltrace
 endif
 
 TESTS_CLI = \
@@ -20,7 +24,6 @@ TESTS_CLI = \
 	cli/test_trimmer
 
 TESTS_LIB = \
-	lib/test_bitfield \
 	lib/test_ctf_writer_complete \
 	lib/test_bt_values \
 	lib/test_ctf_ir_ref \
@@ -31,20 +34,25 @@ TESTS_LIB = \
 	lib/test_cc_prio_map \
 	lib/test_bt_notification_iterator
 
-if ENABLE_PYTHON_PLUGINS
-TESTS_LIB += \
-	lib/writer/test_ctf_writer_no_packet_context.py \
-	lib/writer/test_ctf_writer_empty_packet.py
-endif
-
 if !ENABLE_BUILT_IN_PLUGINS
 TESTS_LIB += lib/test_plugin_complete
 endif
 
+if ENABLE_PYTHON_BINDINGS
+TESTS_LIB += lib/ctf-ir/test_ctf_ir
+TESTS_LIB += lib/ctf-writer/test_ctf_writer
+endif
+
 TESTS_PLUGINS =
 
 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
+endif
 endif
 
 if ENABLE_DEBUG_INFO
@@ -55,12 +63,15 @@ endif
 
 TESTS_PYTHON_PLUGIN_PROVIDER =
 
-if ENABLE_PYTHON_BINDINGS
+if ENABLE_PYTHON_PLUGINS
 TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
 endif
 
-TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_LIB) $(TESTS_PLUGINS) \
-	$(TESTS_PYTHON_PLUGIN_PROVIDER)
+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_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER)
 
 define check_target
 check-$(1):