diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-08-21 00:59:06 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2020-08-21 00:59:06 +0300 |
| commit | 2fd0c591d4a4fea89532910865e7a598def11a6e (patch) | |
| tree | a5889cfdd7ded3ab3c5f05cec42e5bfd60879828 | |
| parent | 0fe0cfaccc979592610cbf65807f19b307957750 (diff) | |
Move fake git path to test target
This moves a fake git test, needed for testing, to the test target of
the Makefile. This mitigates potential issues where the fake git
script is used instead of the real git executable during various
Makefile tasks.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/po-move-git-test-path.yml | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -114,7 +114,7 @@ find_go_packages = $(dir $(call find_go_sources, 's|[^/]*\.go||')) unexport GOROOT export GOBIN = ${BUILD_DIR}/bin export GOPROXY ?= https://proxy.golang.org -export PATH := ${SOURCE_DIR}/internal/testhelper/testdata/home/bin:${BUILD_DIR}/bin:${PATH} +export PATH := ${BUILD_DIR}/bin:${PATH} export GITALY_TESTING_GIT_BINARY ?= ${GIT} .NOTPARALLEL: @@ -168,6 +168,7 @@ binaries: assemble prepare-tests: ${GITLAB_SHELL_DIR}/config.yml ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle .PHONY: test +test: export PATH := ${SOURCE_DIR}/internal/testhelper/testdata/home/bin:${PATH} test: test-go rspec rspec-gitlab-shell .PHONY: test-go diff --git a/changelogs/unreleased/po-move-git-test-path.yml b/changelogs/unreleased/po-move-git-test-path.yml new file mode 100644 index 000000000..cf4d48343 --- /dev/null +++ b/changelogs/unreleased/po-move-git-test-path.yml @@ -0,0 +1,5 @@ +--- +title: Move fake git path to test target +merge_request: 2490 +author: +type: fixed |