Coverage calculation is slow, make a separate test-cover command

operator-framework · Nov 3, 2017 · 449c956 · 449c956
1 parent e0ded23
commit 449c956
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.gitlab-ci.jsonnet b/.gitlab-ci.jsonnet
@@ -78,7 +78,7 @@ local jobs = {
 
     'unit-tests': unittest_stage {
         coverage: @"/\d\d\.\d.$/",
-        script: ["make vendor", "make test", "make cover"],
+        script: ["make vendor", "make test-cover"],
     },
 
     // End2End tests

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -187,8 +187,7 @@ unit-tests:
   image: quay.io/coreos/alm-ci:${CI_COMMIT_REF_SLUG}
   script:
   - make vendor
-  - make test
-  - make cover
+  - make test-cover
   stage: tests
   tags:
   - kubernetes

diff --git a/Makefile b/Makefile
@@ -8,17 +8,23 @@ IMAGE_TAG ?= "dev"
 
 .PHONY: test run clean vendor vendor-update coverage
 
+COVERUTIL := $(GOPATH)/bin/gocoverutil
+
+$(COVERUTIL):
+	go get -u github.com/AlekSi/gocoverutil
+
 all: test build
 
 test:
 	go vet ./pkg/...
-	go test -v -race ./pkg/...
 	go test -v ./Documentation/...
+	go test -v -race ./pkg/...
 
-COVERUTIL := $(GOPATH)/bin/gocoverutil
-
-$(COVERUTIL):
-	go get -u github.com/AlekSi/gocoverutil
+test-cover: $(COVERUTIL)
+	go vet ./pkg/...
+	go test -v ./Documentation/...
+	$(COVERUTIL) -coverprofile=cover.out test -v -race -covermode=count ./pkg/...
+	go tool cover -func=cover.out
 
 cover: $(COVERUTIL)
 	$(COVERUTIL) -coverprofile=cover.out test -covermode=count ./pkg/...