From 1528dce7d177916cdad7aa01b58757bca4e50aef Mon Sep 17 00:00:00 2001 From: Dmitry Zenovich Date: Sat, 13 Jul 2024 23:37:16 +0300 Subject: [PATCH] Revert "Merge Makefile from inprogress branch to compute correct coverage" This reverts commit 5a48ff07476f2e25f53708becc8e666cb6942dd5. --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a097708a5..98fefa83d 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,6 @@ PWD=$(shell pwd) VERSION_FETCHING_CMD=git describe --always --dirty GOBUILD_VERSION_INJECTION=-ldflags="-X main.version=$(shell $(VERSION_FETCHING_CMD))" -# Don't cover the packages ending by test, and separate the packages by a comma -COVER_PACKAGES=$(shell $(GOLIST) ./app/... | grep -v "test$$" | tr '\n' ',') - # Filter for tests ifdef FILTER TEST_FILTER=-run $(FILTER) @@ -85,7 +82,7 @@ test: $(TEST_REPORT_DIR) $(Q)# Warning: DIRECTORY must be a directory, it will fail if it is a file $(Q)# add FILTER=functionToTest to only test a certain function. functionToTest is a Regex. - $(Q)$(GOTEST) -gcflags=all=-l -race -coverpkg=$(COVER_PACKAGES) -coverprofile=$(TEST_REPORT_DIR)/coverage.txt -covermode=atomic -v $(TEST_DIR) -p 1 -parallel 1 $(TEST_FILTER) + $(Q)$(GOTEST) -gcflags=all=-l -race -coverprofile=$(TEST_REPORT_DIR)/coverage.txt -covermode=atomic -v $(TEST_DIR) -p 1 -parallel 1 $(TEST_FILTER) test-unit: $(GOTEST) -gcflags=all=-l -race -cover -v -tags=unit $(TEST_DIR) $(TEST_FILTER) test-bdd: