diff --git a/tests/globalkilltest/Dockerfile b/tests/globalkilltest/Dockerfile index 868f5888656ca..0d90ea007145f 100644 --- a/tests/globalkilltest/Dockerfile +++ b/tests/globalkilltest/Dockerfile @@ -32,8 +32,8 @@ WORKDIR /go/src/github.com/pingcap/tidb COPY go.mod . COPY go.sum . -COPY parser/go.mod parser/go.mod -COPY parser/go.sum parser/go.sum +COPY pkg/parser/go.mod pkg/parser/go.mod +COPY pkg/parser/go.sum pkg/parser/go.sum ARG GOPROXY RUN GO111MODULE=on GOPROXY=${GOPROXY} go mod download diff --git a/tests/globalkilltest/Makefile b/tests/globalkilltest/Makefile index 1b5de94e9d40d..657f4fabe1099 100644 --- a/tests/globalkilltest/Makefile +++ b/tests/globalkilltest/Makefile @@ -17,16 +17,16 @@ OUT_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/bin) include $(BASE_DIR)/Makefile.common -GLOBAL_KILL_TEST_SERVER_LDFLAGS = -X "github.com/pingcap/tidb/domain.ldflagIsGlobalKillTest=1" -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/domain.ldflagServerIDTTL=10" -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/domain.ldflagServerIDTimeToKeepAlive=1" -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/domain.ldflagServerIDTimeToCheckPDConnectionRestored=1" -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/domain.ldflagLostConnectionToPDTimeout=5" -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/store.ldflagGetEtcdAddrsFromConfig=1" - -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/util/globalconn.ldflagIsGlobalKillTest=1" -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/util/globalconn.ldflagServerIDBits32=2" -GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/util/globalconn.ldflagLocalConnIDBits32=4" +GLOBAL_KILL_TEST_SERVER_LDFLAGS = -X "github.com/pingcap/tidb/pkg/domain.ldflagIsGlobalKillTest=1" +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/domain.ldflagServerIDTTL=10" +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/domain.ldflagServerIDTimeToKeepAlive=1" +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/domain.ldflagServerIDTimeToCheckPDConnectionRestored=1" +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/domain.ldflagLostConnectionToPDTimeout=5" +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/store.ldflagGetEtcdAddrsFromConfig=1" + +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/globalconn.ldflagIsGlobalKillTest=1" +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/globalconn.ldflagServerIDBits32=2" +GLOBAL_KILL_TEST_SERVER_LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/globalconn.ldflagLocalConnIDBits32=4" .PHONY: server buildsucc