diff options
| author | John Cai <jcai@gitlab.com> | 2022-09-27 18:16:25 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-09-27 18:16:25 +0300 |
| commit | 6d4ebb397a85b0b1d1784e6946f51f4dab5ac925 (patch) | |
| tree | d6a04537d402e7f18b993471e14fb0cc3d2e1d6f | |
| parent | 2ff0039f15ef06063925ff6c0406f6e092ad2435 (diff) | |
| parent | b1308ad422b8025cf6dfccfc635ebece89a05fd9 (diff) | |
Merge branch 'wc/makefile-override-append' into 'master'
make: use 'override' when adding to TEST_OPTIONS
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4890
Merged-by: John Cai <jcai@gitlab.com>
Approved-by: Pavlo Strokov <pstrokov@gitlab.com>
Approved-by: John Cai <jcai@gitlab.com>
Co-authored-by: Will Chandler <wchandler@gitlab.com>
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -395,11 +395,11 @@ debug-test-go: prepare-tests prepare-debug .PHONY: test ## Run Go benchmarks. -bench: TEST_OPTIONS := ${TEST_OPTIONS} -bench=. -run=^$ +bench: override TEST_OPTIONS := ${TEST_OPTIONS} -bench=. -run=^$ bench: ${BENCHMARK_REPO} test-go .PHONY: test-with-proxies -test-with-proxies: TEST_OPTIONS := ${TEST_OPTIONS} -exec ${SOURCE_DIR}/_support/bad-proxies +test-with-proxies: override TEST_OPTIONS := ${TEST_OPTIONS} -exec ${SOURCE_DIR}/_support/bad-proxies test-with-proxies: TEST_PACKAGES := ${GITALY_PACKAGE}/internal/gitaly/rubyserver test-with-proxies: prepare-tests ${Q}$(call run_go_tests) @@ -411,7 +411,7 @@ test-with-praefect: prepare-tests .PHONY: race-go ## Run Go tests with race detection enabled. -race-go: TEST_OPTIONS := ${TEST_OPTIONS} -race +race-go: override TEST_OPTIONS := ${TEST_OPTIONS} -race race-go: test-go .PHONY: rspec @@ -477,7 +477,7 @@ rubocop: ${SOURCE_DIR}/.ruby-bundle .PHONY: cover ## Generate coverage report via Go tests. -cover: TEST_OPTIONS := ${TEST_OPTIONS} -coverprofile "${TEST_COVERAGE_DIR}/all.merged" +cover: override TEST_OPTIONS := ${TEST_OPTIONS} -coverprofile "${TEST_COVERAGE_DIR}/all.merged" cover: prepare-tests libgit2 ${GOCOVER_COBERTURA} ${Q}rm -rf "${TEST_COVERAGE_DIR}" ${Q}mkdir -p "${TEST_COVERAGE_DIR}" |