Index: src/github.com/pingcap/tidb/Makefile --- src/github.com/pingcap/tidb/Makefile.orig 2020-02-15 23:59:09.000000000 +0100 +++ src/github.com/pingcap/tidb/Makefile 2020-02-16 09:58:01.653859000 +0100 @@ -25,7 +25,7 @@ path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH))):$(PWD)/tools/bin export PATH := $(path_to_add):$(PATH) -GO := GO111MODULE=on go +GO := go GOBUILD := $(GO) build $(BUILD_FLAG) -tags codes GOBUILDCOVERAGE := GOPATH=$(GOPATH) cd tidb-server; $(GO) test -coverpkg="../..." -c . GOTEST := $(GO) test -p $(P) @@ -45,8 +45,8 @@ LDFLAGS += -X "github.com/pingcap/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty --always)" LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')" -LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitHash=$(shell git rev-parse HEAD)" -LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)" +LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitHash=000000" +LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitBranch=master" TEST_LDFLAGS = -X "github.com/pingcap/tidb/config.checkBeforeDropLDFlag=1" COVERAGE_SERVER_LDFLAGS = -X "github.com/pingcap/tidb/tidb-server.isCoverageServer=1" @@ -92,7 +92,6 @@ @gofmt -s -l -w $(FILES) 2>&1 | $(FAIL_ON_STDOUT) goword:tools/bin/goword - tools/bin/goword $(FILES) 2>&1 | $(FAIL_ON_STDOUT) gosec:tools/bin/gosec tools/bin/gosec $$($(PACKAGE_DIRECTORIES)) @@ -117,12 +116,8 @@ ./tools/check/check-gogenerate.sh lint:tools/bin/revive - @echo "linting" - @tools/bin/revive -formatter friendly -config tools/check/revive.toml $(FILES) vet: - @echo "vet" - $(GO) vet -all $(PACKAGES) 2>&1 | $(FAIL_ON_STDOUT) staticcheck: $(GO) get honnef.co/go/tools/cmd/staticcheck @@ -163,36 +158,12 @@ endif gotest: failpoint-enable -ifeq ("$(TRAVIS_COVERAGE)", "1") - @echo "Running in TRAVIS_COVERAGE mode." - $(GO) get github.com/go-playground/overalls - @export log_level=error; \ - $(OVERALLS) -project=github.com/pingcap/tidb \ - -covermode=count \ - -ignore='.git,vendor,cmd,docs,LICENSES' \ - -concurrency=4 \ - -- -coverpkg=./... \ - || { $(FAILPOINT_DISABLE); exit 1; } -else - @echo "Running in native mode." - @export log_level=error; export TZ='Asia/Shanghai'; \ - $(GOTEST) -ldflags '$(TEST_LDFLAGS)' -cover $(PACKAGES) -check.p true -check.timeout 4s || { $(FAILPOINT_DISABLE); exit 1; } -endif - @$(FAILPOINT_DISABLE) race: failpoint-enable - @export log_level=debug; \ - $(GOTEST) -timeout 20m -race $(PACKAGES) || { $(FAILPOINT_DISABLE); exit 1; } - @$(FAILPOINT_DISABLE) leak: failpoint-enable - @export log_level=debug; \ - $(GOTEST) -tags leak $(PACKAGES) || { $(FAILPOINT_DISABLE); exit 1; } - @$(FAILPOINT_DISABLE) tikv_integration_test: failpoint-enable - $(GOTEST) ./store/tikv/. -with-tikv=true || { $(FAILPOINT_DISABLE); exit 1; } - @$(FAILPOINT_DISABLE) RACE_FLAG = ifeq ("$(WITH_RACE)", "1")