From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 18 May 2016 19:18:05 +0000 (-0400)
Subject: Fix: merge tap tests stdout and stderr
X-Git-Tag: v2.9.0-rc1~102
X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=2520968a954ca5fd7cfabf65fe619d00dd8e8631

Fix: merge tap tests stdout and stderr

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@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

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