Skip to content

Commit 48b08f8

Browse files
committed
Test the TSO without compiling the dashboard (ref tikv#4399)
Signed-off-by: JmPotato <[email protected]>
1 parent 4ec9e14 commit 48b08f8

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,19 @@ test-with-cover-parallel: install-go-tools dashboard-ui split
187187
gocov convert coverage | gocov-xml >> coverage.xml;\
188188
@$(FAILPOINT_DISABLE)
189189

190-
test-tso-function: install-go-tools dashboard-ui
190+
test-tso-function: install-go-tools
191191
# testing TSO function...
192192
@$(DEADLOCK_ENABLE)
193193
@$(FAILPOINT_ENABLE)
194-
CGO_ENABLED=1 GO111MODULE=on go test -race -tags tso_function_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; }
194+
CGO_ENABLED=1 GO111MODULE=on go test -race -tags without_dashboard,tso_function_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; }
195195
@$(FAILPOINT_DISABLE)
196196
@$(DEADLOCK_DISABLE)
197197

198-
test-tso-consistency: install-go-tools dashboard-ui
198+
test-tso-consistency: install-go-tools
199199
# testing TSO consistency...
200200
@$(DEADLOCK_ENABLE)
201201
@$(FAILPOINT_ENABLE)
202-
CGO_ENABLED=1 GO111MODULE=on go test -race -tags tso_consistency_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; }
202+
CGO_ENABLED=1 GO111MODULE=on go test -race -tags without_dashboard,tso_consistency_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; }
203203
@$(FAILPOINT_DISABLE)
204204
@$(DEADLOCK_DISABLE)
205205

go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.16
55
require (
66
github.com/AlekSi/gocov-xml v1.0.0
77
github.com/BurntSushi/toml v0.3.1
8-
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
98
github.com/aws/aws-sdk-go v1.35.3
109
github.com/axw/gocov v1.0.0
1110
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5

go.sum

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ github.com/VividCortex/mysqlerr v0.0.0-20200629151747-c28746d985dd/go.mod h1:f3H
2020
github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502 h1:L8IbaI/W6h5Cwgh0n4zGeZpVK78r/jBf9ASurHo9+/o=
2121
github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502/go.mod h1:pmnBM9bxWSiHvC/gSWunUIyDvGn33EkP2CUjxFKtTTM=
2222
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
23-
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
2423
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
2524
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
2625
github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo=

0 commit comments

Comments
 (0)