diff options
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -78,8 +78,8 @@ export PATH := $(PATH):$(LOCAL_TOOLSDIR) GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1) GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.) GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.) -CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 8 \) ] && echo true) -CHECKERRMSG := "ERROR: Go version 1.8.1 or higher is requested (current detected version: $(GOVERSION))." +CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 9 \) ] && echo true) +CHECKERRMSG := "ERROR: Go version 1.9.0 or higher is requested (current detected version: $(GOVERSION))." VERBOSE_1 := -v @@ -119,7 +119,7 @@ xds: scripts tools/syncthing/copytobin @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" . .PHONY: test -test: tools/glide +test: checkgorace tools/glide ifndef name GOCACHE=off go test --race ./test -v else @@ -227,6 +227,9 @@ tools/syncthing/copytobin: checkgover: @test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; } +.PHONY: +checkgorace: checkgover + @ls $(shell go env GOROOT)/src/runtime/race/*.syso 1> /dev/null 2>&1 || { echo "ERROR: go-race package mandatory to run test. Please install it, for example: zypper install go-race"; exit 1; } .PHONY: help help: |