Fix: merge tap tests stdout and stderr

[lttng-tools.git] / tests / regression / Makefile.am

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 5f4a6e4c063d3e666a0ce89f954a673a8ec514a8..6a2d24c7bf3cab9b2a57bf1c58f33e9e1d3fb05e 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = tools kernel ust
 
 SUBDIRS = tools kernel ust
 

+LOG_DRIVER_FLAGS='--merge'

 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
        $(top_srcdir)/config/tap-driver.sh
 
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
        $(top_srcdir)/config/tap-driver.sh