X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=8d14cef024ce10941745761a8d06d120643218ec;hb=9b1d6816c871c223111c817e33b23df01fd4dee1;hp=324c028a7c41eb7bd166987b7f882f5576b853d3;hpb=e9e36a3889cd30d2bc1a193fd87fbc0535109972;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 324c028a..8d14cef0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,24 +25,30 @@ TESTS_CLI = \
 
 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_ctf_writer_complete \
 	lib/test_graph_topo \
-	lib/test_cc_prio_map \
-	lib/test_bt_notification_iterator
+	lib/test_trace_ir_ref
 
 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 =
 
 if !ENABLE_BUILT_IN_PLUGINS
-TESTS_PLUGINS += plugins/test-utils-muxer-complete
+if ENABLE_PYTHON_BINDINGS
+TESTS_PLUGINS += plugins/ctf/test_ctf_plugin
+
+if ENABLE_DEBUG_INFO
+TESTS_PLUGINS += plugins/test_lttng_utils_debug_info
+endif
+endif
 endif
 
 if ENABLE_DEBUG_INFO
@@ -57,8 +63,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):