From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Wed, 18 May 2016 19:26:57 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-ust] Fix: merge tap tests stdout and
	stderr
In-Reply-To: <1463599085-28416-1-git-send-email-mjeanson@efficios.com>
References: <1463599085-28416-1-git-send-email-mjeanson@efficios.com>
Message-ID: <1314058747.12951.1463599617158.JavaMail.zimbra@efficios.com>

merged into master and stable-2.8, thanks!

Mathieu

----- On May 18, 2016, at 3:18 PM, Michael Jeanson mjeanson at efficios.com wrote:

> 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/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

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com