diff options
| author | Toon Claes <toon@gitlab.com> | 2021-02-01 13:04:22 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-02-01 13:04:22 +0300 |
| commit | 4d1454291a904d2907eab9ad9002f7a9058678b1 (patch) | |
| tree | b2e86228fc8de350b0f93ebf1ab143b5944dc5ef | |
| parent | 0d8e8d6873722723e085d94af57778674db5f46f (diff) | |
| parent | d048b0ea6aa8651dd072fe3b94944636b2638146 (diff) | |
Merge branch 'pks-makefile-libgit2-prepare-tests' into 'master'
Makefile: Build libgit2 as part of prepare-tests
See merge request gitlab-org/gitaly!3079
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -215,7 +215,7 @@ binaries: assemble ${Q}cd ${ASSEMBLY_ROOT} && sha256sum bin/* | tee checksums.sha256.txt .PHONY: prepare-tests -prepare-tests: git prepare-test-repos ${SOURCE_DIR}/.ruby-bundle +prepare-tests: git libgit2 prepare-test-repos ${SOURCE_DIR}/.ruby-bundle .PHONY: prepare-test-repos prepare-test-repos: ${TEST_REPO} ${TEST_REPO_GIT} @@ -224,7 +224,7 @@ prepare-test-repos: ${TEST_REPO} ${TEST_REPO_GIT} test: test-go rspec .PHONY: test-go -test-go: prepare-tests ${GO_JUNIT_REPORT} libgit2 +test-go: prepare-tests ${GO_JUNIT_REPORT} ${Q}mkdir -p ${TEST_REPORT_DIR} ${Q}echo 0 >${TEST_EXIT} ${Q}$(call run_go_tests) 2>&1 | tee ${TEST_OUTPUT} || echo $$? >${TEST_EXIT} |