diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-06-07 06:53:49 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-06-07 16:44:39 +0300 |
| commit | 935a3a8bb0c00a82071dad3dc25f46965b42447a (patch) | |
| tree | 4e522b4bb9af12dc6b346f71b79cb690778f1c2a /Makefile | |
| parent | 3f13321e5997c53ab8028005701002a6a17845af (diff) | |
Makefile: Rename variable to enable SHA256 tests to `TEST_WITH_SHA256`
The variable `TEST_WITH_SHA256` controls whether Gitaly's test suite
should run with SHA1 or SHA256. It is quite long and thus unhandy to
write, and doesn't match the remaining test-related variables we have in
our Makefile.
Rename the variable to `TEST_WITH_SHA256` for brevity and consistency.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -97,11 +97,6 @@ ifdef FIPS_MODE export GITALY_TESTING_ENABLE_FIPS := YesPlease endif -ifdef GITALY_TESTING_ENABLE_SHA256 - SERVER_BUILD_TAGS := ${SERVER_BUILD_TAGS},gitaly_test_sha256 - GIT2GO_BUILD_TAGS := ${GIT2GO_BUILD_TAGS},gitaly_test_sha256 -endif - # protoc target PROTOC_VERSION ?= v23.1 PROTOC_REPO_URL ?= https://github.com/protocolbuffers/protobuf @@ -357,6 +352,13 @@ prepare-tests: ${DEPENDENCY_DIR}/git-distribution/git export GITALY_TESTING_GIT_BINARY ?= ${DEPENDENCY_DIR}/git-distribution/bin-wrappers/git endif +## Enable testing with the SHA256 object format. +TEST_WITH_SHA256 ?= +ifdef TEST_WITH_SHA256 + SERVER_BUILD_TAGS := ${SERVER_BUILD_TAGS},gitaly_test_sha256 + GIT2GO_BUILD_TAGS := ${GIT2GO_BUILD_TAGS},gitaly_test_sha256 +endif + .PHONY: prepare-tests prepare-tests: libgit2 prepare-test-repos ${GOTESTSUM} ${GITALY_PACKED_EXECUTABLES} ${Q}mkdir -p "$(dir ${TEST_JUNIT_REPORT})" |