X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=88dce23a0db44cfec148cff068b50931e5e82887;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hp=c5d61bab330bf37c4f0cffee0bee1b1470818d74;hpb=9e607e7cc6da6b94b401dffd8b6dfd5a03ace443;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c5d61bab..88dce23a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,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 \
@@ -35,20 +34,25 @@ TESTS_LIB = \
 	lib/test_cc_prio_map \
 	lib/test_bt_notification_iterator
 
-if ENABLE_PYTHON_BINDINGS
-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
@@ -63,8 +67,11 @@ 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):