diff --git a/.gitignore b/.gitignore index 54d0e3ea2d..77a1c109fa 100644 --- a/.gitignore +++ b/.gitignore @@ -21,9 +21,7 @@ _cgo_gotypes.go _cgo_export.* _testmain.go -test-report.json -coverage.out coverage.html *.exe diff --git a/Makefile b/Makefile index 9d93245c6b..cbc1f172b6 100644 --- a/Makefile +++ b/Makefile @@ -367,12 +367,13 @@ gotest: $(SOURCE_GENERATED) ## Trigger minikube test $(if $(quiet),@echo " TEST $@") $(Q)go test -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" $(MINIKUBE_TEST_FILES) -test-report.json: $(SOURCE_FILES) $(GOTEST_FILES) +out/test-report.json: $(SOURCE_FILES) $(GOTEST_FILES) $(if $(quiet),@echo " TEST $@") - $(Q)go test -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -json $(MINIKUBE_TEST_FILES) -coverprofile=coverage.out > test-report.json + $(Q)go test -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" $(MINIKUBE_TEST_FILES) \ + -json -coverprofile=out/coverage.out > out/test-report.json -coverage.out: test-report.json -coverage.html: coverage.out +out/coverage.out: out/test-report.json +coverage.html: out/coverage.out $(if $(quiet),@echo " COVER $@") $(Q)go tool cover -html=$< -o $@ diff --git a/sonar-project.properties b/sonar-project.properties index 3a50fa195b..d3722bf2ea 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,5 +7,5 @@ sonar.exclusions=**/*_test.go,pkg/minikube/assets/assets.go,pkg/minikube/transla sonar.tests=cmd,pkg sonar.test.inclusions=**/*_test.go -sonar.go.tests.reportPaths=test-report.json -sonar.go.coverage.reportPaths=coverage.out +sonar.go.tests.reportPaths=out/test-report.json +sonar.go.coverage.reportPaths=out/coverage.out