* [lttng-dev] [PATCH lttng-ust] Fix: merge tap tests stdout and stderr
@ 2016-05-18 19:18 Michael Jeanson
2016-05-18 19:26 ` Mathieu Desnoyers
0 siblings, 1 reply; 2+ messages in thread
From: Michael Jeanson @ 2016-05-18 19:18 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [lttng-dev] [PATCH lttng-ust] Fix: merge tap tests stdout and stderr
2016-05-18 19:18 [lttng-dev] [PATCH lttng-ust] Fix: merge tap tests stdout and stderr Michael Jeanson
@ 2016-05-18 19:26 ` Mathieu Desnoyers
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Desnoyers @ 2016-05-18 19:26 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-18 19:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-18 19:18 [lttng-dev] [PATCH lttng-ust] Fix: merge tap tests stdout and stderr Michael Jeanson
2016-05-18 19:26 ` Mathieu Desnoyers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox