From a2f3dcaf9a10756b09e82b1abada5da438d58c2c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 30 Oct 2019 18:09:18 +0100 Subject: [PATCH] build all tests and run all tests too (#254) golangci-lint runs its checks also on tests files, so make sure that they build properly before running the linter. there is no obvious solution to just build all the test without running them, so to work that around, we specify a -run flag with a value that surely isn't going to match any test function any time soon. that way we build all the tests, but no test is run. also, `go list ./...` returns only packages in the module, but no packages within submodule, so exporter/trace/jaeger (which is a submodule) was never on the list. so go test with those packages never ran the jaeger trace exporter tests. fix this by visiting every directory with the go.mod file and calling go test [options] ./... therein. --- Makefile | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 1e75452b7..5047e457d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -ALL_PKGS := $(shell GO111MODULE=on go list ./...) - export GO111MODULE=on EXAMPLES := $(shell ./get_main_pkgs.sh ./example) @@ -34,22 +32,30 @@ precommit: $(TOOLS_DIR)/golangci-lint $(TOOLS_DIR)/misspell $(TOOLS_DIR)/string # TODO: Fix this on windows. set -e; for dir in $(ALL_GO_MOD_DIRS); do \ echo "compiling all packages in $${dir}"; \ - (cd "$${dir}" && go build ./...); \ + (cd "$${dir}" && \ + go build ./... && \ + go test -run xxxxxMatchNothingxxxxx ./... >/dev/null); \ done set -e; for dir in $(ALL_GO_MOD_DIRS); do \ echo "golangci-lint in $${dir}"; \ - (cd "$${dir}" && $(abspath $(TOOLS_DIR))/golangci-lint run --fix); \ + (cd "$${dir}" && \ + $(abspath $(TOOLS_DIR))/golangci-lint run --fix); \ done $(TOOLS_DIR)/misspell -w $(ALL_DOCS) set -e; for dir in $(ALL_GO_MOD_DIRS); do \ echo "go mod tidy in $${dir}"; \ - (cd "$${dir}" && go mod tidy); \ + (cd "$${dir}" && \ + go mod tidy); \ done .PHONY: test-with-coverage test-with-coverage: - $(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) $(ALL_PKGS) - go tool cover -html=coverage.txt -o coverage.html + set -e; for dir in $(ALL_GO_MOD_DIRS); do \ + echo "go test ./... + coverage in $${dir}"; \ + (cd "$${dir}" && \ + $(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) ./... && \ + go tool cover -html=coverage.txt -o coverage.html); \ + done .PHONY: circle-ci circle-ci: precommit test-clean-work-tree test-with-coverage test-386 examples @@ -66,22 +72,25 @@ test-clean-work-tree: .PHONY: test test: examples - $(GOTEST) $(GOTEST_OPT) $(ALL_PKGS) - $(GOTEST) $(GOTEST_OPT_WITH_RACE) $(ALL_PKGS) + set -e; for dir in $(ALL_GO_MOD_DIRS); do \ + echo "go test ./... + race in $${dir}"; \ + (cd "$${dir}" && \ + $(GOTEST) $(GOTEST_OPT) ./... && \ + $(GOTEST) $(GOTEST_OPT_WITH_RACE) ./...); \ + done .PHONY: test-386 test-386: - GOARCH=386 $(GOTEST) -v -timeout 30s $(ALL_PKGS) + set -e; for dir in $(ALL_GO_MOD_DIRS); do \ + echo "go test ./... GOARCH 386 in $${dir}"; \ + (cd "$${dir}" && \ + GOARCH=386 $(GOTEST) -v -timeout 30s ./...); \ + done .PHONY: examples examples: @set -e; for ex in $(EXAMPLES); do \ echo "Building $${ex}"; \ - (cd "$${ex}" && go build .); \ + (cd "$${ex}" && \ + go build .); \ done - -all-pkgs: - @echo $(ALL_PKGS) | tr ' ' '\n' | sort - -all-docs: - @echo $(ALL_DOCS) | tr ' ' '\n' | sort