From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 31 May 2016 11:31:55 +0000 (-0400)
Subject: Tests: Add missing --merge LOG_DRIVER_FLAGS
X-Git-Tag: v1.4.0~4
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=9cfb3bff3f4d92f1b702f80b456bab3f775de415;hp=3c067fc14e0f64406e64947191d7a212a5ffc5fa

Tests: Add missing --merge LOG_DRIVER_FLAGS

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c64e4dec..98c7473c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = utils bin lib
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/config/tap-driver.sh