X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=19c2483eb3b76762b68fe1688b30cde02c25e502;hb=41384c0ab58b0f83f942e7f99a8b0673f892a86c;hp=324c028a7c41eb7bd166987b7f882f5576b853d3;hpb=aba778b875de0ec9aa99c8de6371d69bd8ec9b02;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 324c028a..19c2483e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,6 +57,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)