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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-03-07 13:37:30 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-03-28 10:06:28 +0300
commit4cfd88ae0d5a02ec54f12367f84e5bb4d16c1569 (patch)
treeda1ec91d6568305ddc8bc12a51bd3d6fc0cfa45e
parent1d49b915c3fa9088c503f54c6edd8db65a2ba5b6 (diff)
Makefile: Drop dependency on bundled Git in our non-bundled tests
Our non-bundled test targets currently depend on bundled Git. This was done such that we were able to verify the bundled Git feature flag, which toggled between both bundled Git and distributed Git. Now that this feature flag is gone it doesn't make any sense to keep testing with both Git execution environments installed.
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b6372e551..373efa3eb 100644
--- a/Makefile
+++ b/Makefile
@@ -375,10 +375,9 @@ install: install-bundled-git
export GITALY_TESTING_BUNDLED_GIT_PATH ?= ${BUILD_DIR}/bin
else
-prepare-tests: git build-bundled-git
+prepare-tests: git
-export GITALY_TESTING_BUNDLED_GIT_PATH ?= ${BUILD_DIR}/bin
-export GITALY_TESTING_GIT_BINARY ?= ${GIT_PREFIX}/bin/git
+export GITALY_TESTING_GIT_BINARY ?= ${GIT_PREFIX}/bin/git
endif
.PHONY: prepare-tests