Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab/ci/test.yml2
-rw-r--r--Makefile.util.mk6
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 5c8e783b..3d188559 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -17,7 +17,7 @@ tests:
extends: .tests-matrix
script:
- echo "Running all unit tests..."
- - make test ARGS='-short'
+ - make unit-test
tests-acceptance:
extends: .tests-matrix
diff --git a/Makefile.util.mk b/Makefile.util.mk
index a2eea8bf..ce84d578 100644
--- a/Makefile.util.mk
+++ b/Makefile.util.mk
@@ -1,4 +1,4 @@
-.PHONY: lint format test race acceptance bench cover deps-check mocks-check deps-download changelog zip
+.PHONY: lint format test unit-test race acceptance bench cover deps-check mocks-check deps-download changelog zip
OUT_FORMAT ?= colored-line-number
LINT_FLAGS ?= $(if $V,-v)
@@ -14,9 +14,11 @@ format:
$Q go run github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_VERSION) run ./... --fix --out-format $(OUT_FORMAT) $(LINT_FLAGS) | tee ${REPORT_FILE}
test: gitlab-pages
- rm -f tests.out
go run gotest.tools/gotestsum@$(GOTESTSUM_VERSION) --junitfile junit-test-report.xml --format testname -- ./... ${ARGS}
+unit-test:
+ go run gotest.tools/gotestsum@$(GOTESTSUM_VERSION) --junitfile junit-test-report.xml --format testname -- -short ./... ${ARGS}
+
race: gitlab-pages
go run gotest.tools/gotestsum@$(GOTESTSUM_VERSION) --junitfile junit-test-report.xml --format testname -- -race $(if $V,-v) ./... ${ARGS}