From f148a4a1ed55c75d391930865185fb7bfbee03ba Mon Sep 17 00:00:00 2001
From: Ethan Koenig <ethantkoenig@gmail.com>
Date: Sun, 26 Nov 2017 10:07:40 -0800
Subject: [PATCH] Fix coverage reports (#2974)

---
 Makefile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 9f6d769d22..501defcd94 100644
--- a/Makefile
+++ b/Makefile
@@ -138,14 +138,7 @@ coverage:
 	@hash gocovmerge > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u github.com/wadey/gocovmerge; \
 	fi
-	echo "mode: set" > coverage.all
-	for PKG in $(PACKAGES); do\
-		egrep "$$PKG[^/]*\.go" integration.coverage.out > int.coverage.out;\
-		gocovmerge $$GOPATH/src/$$PKG/coverage.out int.coverage.out > pkg.coverage.out;\
-		grep -h -v "^mode:" pkg.coverage.out >>  coverage.all;\
-		mv pkg.coverage.out $$GOPATH/src/$$PKG/coverage.out;\
-		rm int.coverage.out;\
-	done;
+	gocovmerge integration.coverage.out $(shell find . -type f -name "coverage.out") > coverage.all;\
 
 .PHONY: unit-test-coverage
 unit-test-coverage: