[lttng-dev] [PATCH lttng-tools] Fix: merge tap tests stdout and stderr

[Michael Jeanson]

This makes the output and error statement ordered in the log
file and ensure that the first line is the tap test plan. Some tap
parser are confused if the test plan is not on the first line.

Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 tests/regression/Makefile.am | 1 +
 tests/unit/Makefile.am       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 5f4a6e4..6a2d24c 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = tools kernel ust
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/config/tap-driver.sh
 
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b7f318f..5625cf0 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
 
-- 
2.7.4