From mboxrd@z Thu Jan 1 00:00:00 1970 From: mjeanson@efficios.com (Michael Jeanson) Date: Wed, 18 May 2016 15:18:05 -0400 Subject: [lttng-dev] [PATCH lttng-ust] Fix: merge tap tests stdout and stderr Message-ID: <1463599085-28416-1-git-send-email-mjeanson@efficios.com> 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 --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 96a3faa..fd2eac3 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 -- 2.7.4