X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=fd2eac397a04e3e5a64f20fea5dec32748772620;hb=61c7059659a5a8970802ae8211d6e05d1b55cf89;hp=96a3faae6b69427527a87b52bdb70c4cbf0af206;hpb=26bb88df22d15a644fa44ef093bcb39a809922b7;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96a3faae..fd2eac39 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,6 +5,7 @@ if CXX_WORKS
 SUBDIRS += hello.cxx
 endif
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/config/tap-driver.sh