Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Subject: [lttng-dev] [PATCH lttng-ust] Fix: merge tap tests stdout and stderr
Date: Wed, 18 May 2016 19:26:57 +0000 (UTC)	[thread overview]
Message-ID: <1314058747.12951.1463599617158.JavaMail.zimbra@efficios.com> (raw)
In-Reply-To: <1463599085-28416-1-git-send-email-mjeanson@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


      reply	other threads:[~2016-05-18 19:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-18 19:18 Michael Jeanson
2016-05-18 19:26 ` Mathieu Desnoyers [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1314058747.12951.1463599617158.JavaMail.zimbra@efficios.com \
    --to=mathieu.desnoyers@efficios.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox