From 9648cc5eaac04b038db486efc865dce1b5286931 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 24 Mar 2020 20:14:29 +0100
Subject: [PATCH] tests: Revert the --merge option

This is causing the tests to hang on errors sometimes.
---
 buildutil/glib-tap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk
index 943a31c4..b05ad5f1 100644
--- a/buildutil/glib-tap.mk
+++ b/buildutil/glib-tap.mk
@@ -7,7 +7,7 @@ TESTS_ENVIRONMENT= \
 	G_DEBUG=gc-friendly 			\
 	MALLOC_CHECK_=2 			\
 	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/buildutil/tap-driver.sh --merge
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/buildutil/tap-driver.sh
 LOG_COMPILER = $(top_srcdir)/buildutil/tap-test
 
 TESTS =