From 8689ad30df1d78a7bc7a6404490e0cdcfb4e0295 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 18 May 2016 15:43:06 -0400 Subject: [PATCH] Fix: merge tap tests stdout and stderr MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jérémie Galarneau --- 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 5f4a6e4c0..6a2d24c7b 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 b7f318fcc..5625cf0fc 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.34.1