X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=5625cf0fcba42387266e90d05b4a98e5d5169f62;hb=8689ad30df1d78a7bc7a6404490e0cdcfb4e0295;hp=b7f318fccc19f62093ad82ec7a8bf3144546eef2;hpb=a36b26b4511eded3dbaecaa3a154b5c212391a31;p=lttng-tools.git

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b7f318fcc..5625cf0fc 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = ini_config
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 AM_LDFLAGS =
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/config/tap-driver.sh