diff options
| author | James Fargher <jfargher@gitlab.com> | 2021-12-01 06:05:34 +0300 |
|---|---|---|
| committer | James Fargher <jfargher@gitlab.com> | 2021-12-01 23:50:56 +0300 |
| commit | 4532ef9766313678d7aed6f158ce46878a1ea203 (patch) | |
| tree | be1c99b97848738eca1f6154efcdf14c9bd52cff /Makefile | |
| parent | 6ade1aa5b8a794f865ddba1128a86192dc3562cd (diff) | |
Fix go test report filename
In the Makefile, GIT_VERSION is overwritten when it is default. This
makes the junit filename no longer match what is specified in
gitlab-ci.yml. Instead here we are simplifying down to a static
filename. There shouldn't be any risk of the report being overwritten
since CI runs each permutation of the test matrix in separate
containers.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -206,9 +206,7 @@ endif TEST_PACKAGES ?= ${SOURCE_DIR}/... ## Test options passed to `go test`. TEST_OPTIONS ?= -v -count=1 -TEST_REPORT_DIR ?= ${BUILD_DIR}/reports -TEST_OUTPUT_NAME ?= go-${GO_VERSION}-git-${GIT_VERSION} -TEST_REPORT ?= ${TEST_REPORT_DIR}/go-tests-report-${TEST_OUTPUT_NAME}.xml +TEST_REPORT ?= ${BUILD_DIR}/reports/go-tests-report.xml ## Directory where all runtime test data is being created. TEST_TMP_DIR ?= TEST_REPO_DIR := ${BUILD_DIR}/testrepos @@ -327,7 +325,7 @@ endif .PHONY: prepare-tests prepare-tests: libgit2 prepare-test-repos ${SOURCE_DIR}/.ruby-bundle ${GOTESTSUM} - ${Q}mkdir -p ${TEST_REPORT_DIR} + ${Q}mkdir -p ${dir ${TEST_REPORT}} .PHONY: prepare-test-repos prepare-test-repos: ${TEST_REPO} ${TEST_REPO_GIT} |