Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: fix path of LDFLAGS for global kill e2e test #47896

Merged
merged 1 commit into from
Oct 21, 2023
+12 −12
Merged

tests: fix path of LDFLAGS for global kill e2e test #47896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/globalkilltest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 10 additions & 10 deletions tests/globalkilltest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down