Skip to content

Commit

Permalink
ci: document TEST_COVERAGE and GO_COVER_DIR in buid.env
Browse files Browse the repository at this point in the history
Signed-off-by: Niels de Vos <ndevos@redhat.com>
  • Loading branch information
nixpanic authored and mergify[bot] committed Jun 28, 2020
1 parent 4fd973b commit 3cc791c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ branches:
env:
global:
- GO111MODULE=on
- TEST_COVERAGE=stdout
- GO_METALINTER_THREADS=1
- GO_COVER_DIR=_output
- KUBECONFIG=$HOME/.kube/config
# set CEPH_CSI_RUN_ALL_TESTS to non-empty to run all tests
- CEPH_CSI_RUN_ALL_TESTS=true
Expand Down Expand Up @@ -83,7 +81,7 @@ jobs:
- make go-lint
- make lint-extras
- make gosec
- make go-test
- make go-test TEST_COVERAGE=stdout GO_COVER_DIR=_output/
- make mod-check

- stage: build testing
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ all: cephcsi
test: go-test static-check mod-check
static-check: check-env go-lint lint-extras gosec

go-test: TEST_COVERAGE ?= $(shell . $(CURDIR)/build.env ; echo $${TEST_COVERAGE})
go-test: GO_COVER_DIR ?= $(shell . $(CURDIR)/build.env ; echo $${GO_COVER_DIR})
go-test: check-env
./scripts/test-go.sh
TEST_COVERAGE=$(TEST_COVERAGE) GO_COVER_DIR=$(GO_COVER_DIR) ./scripts/test-go.sh

mod-check: check-env
@echo 'running: go mod verify'
Expand Down
5 changes: 5 additions & 0 deletions build.env
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ GO111MODULE=on
GOLANGCI_VERSION=v1.21.0
GOSEC_VERSION=2.0.0

# "go test" configuration
# set to stdout or html to enable coverage reporting, disabled by default
#TEST_COVERAGE=html
#GO_COVER_DIR=_output/

# helm chart generation, testing and publishing
HELM_VERSION=v3.1.2

Expand Down
2 changes: 1 addition & 1 deletion scripts/test-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ for gopackage in ${GOPACKAGES}; do
fi
if [[ ${TEST_COVERAGE} = "html" && -f cover.out ]]; then
mkdir -p coverage
fn="coverage/${gopackage////-}.html"
fn="${GO_COVER_DIR}/${gopackage////-}.html"
echo " * generating coverage html: ${fn}"
go tool cover -html=cover.out -o "${fn}"
fi
Expand Down

0 comments on commit 3cc791c

Please sign in to comment.