X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=a0f26a1fbf3506b0f6255733d6faba599be0ffa3;hb=63f99cca61d1f83364d96a01c6d837639bb00275;hp=324c028a7c41eb7bd166987b7f882f5576b853d3;hpb=e9e36a3889cd30d2bc1a193fd87fbc0535109972;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 324c028a..a0f26a1f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -43,6 +43,12 @@ 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
@@ -57,6 +63,9 @@ 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_LIB) $(TESTS_PLUGINS) \
 	$(TESTS_PYTHON_PLUGIN_PROVIDER)