don't pass --merge to the TAP driver

The --merge option combines stderr and stdout, which can confuse the TAP output parsing.
rhansen · Apr 22, 2016 · 4fb936e · 4fb936e
1 parent 0329492
commit 4fb936e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mk/tests-environment.mk b/mk/tests-environment.mk
@@ -16,7 +16,7 @@ TAP_LOG_COMPILER = $(LOG_COMPILER)
 # show the individual TAP test cases; the return value of the TAP test
 # scripts determine pass or fail as usual)
 TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/build-aux/tap-driver.sh --ignore-exit --merge
+	$(top_srcdir)/build-aux/tap-driver.sh --ignore-exit
 EXTRA_DIST += tests/tap4sh.sh
 
 EXTRA_DIST += etc/test.conf