aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Koenig <ethantkoenig@gmail.com>2017-11-26 10:07:40 -0800
committerLauris BH <lauris@nix.lv>2017-11-26 20:07:40 +0200
commitf148a4a1ed55c75d391930865185fb7bfbee03ba (patch)
tree71fed00892edc4377cc18653055da92c83e84496
parent4d85c1d3c875609b57219ab7b74678f5876dbccb (diff)
downloadgitea-f148a4a1ed55c75d391930865185fb7bfbee03ba.tar.gz
gitea-f148a4a1ed55c75d391930865185fb7bfbee03ba.zip
Fix coverage reports (#2974)
-rw-r--r--Makefile9
1 files changed, 1 insertions, 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: