From 792cde7081075e63df7f42aaee14d819ff248d26 Mon Sep 17 00:00:00 2001
From: Ethan Koenig <etk39@cornell.edu>
Date: Thu, 15 Jun 2017 05:38:33 -0400
Subject: [PATCH] Coverage reports for integration tests (#1960)

---
 .drone.yml |  1 +
 .gitignore |  2 +-
 Makefile   | 27 +++++++++++++++++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d7bd5d15e..ea7e4bd1f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -46,6 +46,7 @@ pipeline:
       GOPATH: /srv/app
     commands:
       - apk -U add openssh-client
+      - go get github.com/wadey/gocovmerge
       - make test-coverage
     when:
       event: [ push ]
diff --git a/.gitignore b/.gitignore
index 339cc67b5..87d5327ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ _testmain.go
 *.test
 *.prof
 
-coverage.out
+*coverage.out
 
 /modules/options/bindata.go
 /modules/public/bindata.go
diff --git a/Makefile b/Makefile
index 0b9935fc0..a0f73658a 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,17 @@ test: fmt-check
 	go test $(PACKAGES)
 
 .PHONY: test-coverage
-test-coverage:
+test-coverage: unit-test-coverage integration-test-coverage
+	for PKG in $(PACKAGES); do\
+	  touch $$GOPATH/src/$$PKG/coverage.out;\
+	  egrep "$$PKG[^/]*\.go" integration.coverage.out > int.coverage.out;\
+	  gocovmerge $$GOPATH/src/$$PKG/coverage.out int.coverage.out > pkg.coverage.out;\
+	  mv pkg.coverage.out $$GOPATH/src/$$PKG/coverage.out;\
+	  rm int.coverage.out;\
+	done;
+
+.PHONY: unit-test-coverage
+unit-test-coverage:
 	for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
 
 .PHONY: test-vendor
@@ -124,9 +134,8 @@ test-vendor:
 	govendor status || exit 1
 
 .PHONY: test-sqlite
-test-sqlite:
-	go test -c code.gitea.io/gitea/integrations -tags 'sqlite'
-	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.test
+test-sqlite: integrations.sqlite.test
+	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
 
 .PHONY: test-mysql
 test-mysql: integrations.test
@@ -136,9 +145,19 @@ test-mysql: integrations.test
 test-pgsql: integrations.test
 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test
 
+.PHONY: integration-test-coverage
+integration-test-coverage: integrations.cover.test
+	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
+
 integrations.test: $(SOURCES)
 	go test -c code.gitea.io/gitea/integrations
 
+integrations.sqlite.test: $(SOURCES)
+	go test -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite'
+
+integrations.cover.test: $(SOURCES)
+	go test -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
+
 .PHONY: check
 check: test