From: jeremie.galarneau@efficios.com (Jérémie Galarneau)
Subject: [lttng-dev] [PATCH lttng-tools] Fix: merge tap tests stdout and stderr
Date: Wed, 18 May 2016 17:55:14 -0400 [thread overview]
Message-ID: <CA+jJMxtXjNHDmo5-VDF45+aYe=52XtNEgVyUnFL1jbohDOw7yA@mail.gmail.com> (raw)
In-Reply-To: <1463600586-29374-1-git-send-email-mjeanson@efficios.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
Merged, thanks!
Jérémie
On Wed, May 18, 2016 at 3:43 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/regression/Makefile.am | 1 +
> tests/unit/Makefile.am | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
> index 5f4a6e4..6a2d24c 100644
> --- a/tests/regression/Makefile.am
> +++ b/tests/regression/Makefile.am
> @@ -1,5 +1,6 @@
> SUBDIRS = tools kernel ust
>
> +LOG_DRIVER_FLAGS='--merge'
> LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
> $(top_srcdir)/config/tap-driver.sh
>
> diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
> index b7f318f..5625cf0 100644
> --- a/tests/unit/Makefile.am
> +++ b/tests/unit/Makefile.am
> @@ -3,6 +3,7 @@ SUBDIRS = ini_config
> AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
> AM_LDFLAGS =
>
> +LOG_DRIVER_FLAGS='--merge'
> LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
> $(top_srcdir)/config/tap-driver.sh
>
> --
> 2.7.4
>
--
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
prev parent reply other threads:[~2016-05-18 21:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 19:43 Michael Jeanson
2016-05-18 21:55 ` Jérémie Galarneau [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='CA+jJMxtXjNHDmo5-VDF45+aYe=52XtNEgVyUnFL1jbohDOw7yA@mail.gmail.com' \
--to=jeremie.galarneau@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