You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

81 lines
2.9 KiB

Index: src/github.com/pingcap/tidb/Makefile
--- src/github.com/pingcap/tidb/Makefile.orig 2019-11-24 17:00:06.000000000 +0100
+++ src/github.com/pingcap/tidb/Makefile 2019-11-24 17:07:31.987438000 +0100
@@ -11,7 +11,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 8
@@ -30,8 +30,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"
LDFLAGS += -X "github.com/pingcap/tidb/util/printer.GoVersion=$(shell go version)"
TEST_LDFLAGS = -X "github.com/pingcap/tidb/config.checkBeforeDropLDFlag=1"
@@ -78,7 +78,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))
@@ -106,12 +105,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)
tidy:
@echo "go mod tidy"
@@ -142,36 +137,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.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")