Skip to contentSkip to conversation

Fix: merge tap tests stdout and stderr

PATCH Jérémie Galarneau 1 participant 1 message May 18, 2016 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Jérémie Galarneau

author Applied
#1 lore raw

Merged, thanks!

Jérémie

Quoted 36 lines · Michael Jeanson

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.

---
 tests/regression/Makefile.am | 1 +
 tests/unit/Makefile.am       | 1 +
 2 files changed, 2 insertions(+)
tests/regression/Makefile.am +1 -0
index 5f4a6e4..6a2d24c 100644
@@ -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
 
tests/unit/Makefile.am +1 -1
index b7f318f..5625cf0 100644
@@ -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

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev