X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=fd2eac397a04e3e5a64f20fea5dec32748772620;hb=1e1110055efac3a1713fe0c7b5f36d5b98895d92;hp=96a3faae6b69427527a87b52bdb70c4cbf0af206;hpb=f3c7428e8878c6e467020881813c018e0d530a21;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