Merge ee712c9 into 04170fa

tikv · Dec 27, 2018 · d1eb58f · d1eb58f
2 parents 04170fa + ee712c9
commit d1eb58f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -104,8 +104,10 @@ travis_coverage: export GO111MODULE=on
 travis_coverage:
 ifeq ("$(TRAVIS_COVERAGE)", "1")
 	@$(GOFAIL_ENABLE)
-	CGO_ENABLED=1 ./scripts/retool do $(OVERALLS) -project=github.com/pingcap/pd -covermode=count -ignore='.git,vendor' -- -coverpkg=./... || { $(GOFAIL_DISABLE); exit 1; }
-	CGO_ENABLED=0 ./scripts/retool do $(GOVERALLS) -service=travis-ci -coverprofile=overalls.coverprofile || { $(GOFAIL_DISABLE); exit 1; }
+	CGO_ENABLED=1 ./scripts/retool do $(OVERALLS) -project=github.com/pingcap/pd -covermode=count -ignore='.git,vendor,tools' -- -coverpkg=./... || { $(GOFAIL_DISABLE); exit 1; }
+	@echo "Note: ignore tools"
+	grep -vE "tools" overalls.coverprofile > coverage.out
+	CGO_ENABLED=0 ./scripts/retool do $(GOVERALLS) -service=travis-ci -coverprofile=coverage.out || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)
 else
 	@echo "coverage only runs in travis."