From d297ebddaf41fd0c80bb3a9b86b082c60133a6e1 Mon Sep 17 00:00:00 2001 From: JmPotato Date: Wed, 8 Dec 2021 21:28:18 +0800 Subject: [PATCH] Test the TSO without compiling the dashboard #4399 Signed-off-by: JmPotato --- Makefile | 8 ++++---- go.mod | 1 - go.sum | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index baa0314c2544..187e689d5ec5 100644 --- a/Makefile +++ b/Makefile @@ -187,19 +187,19 @@ test-with-cover-parallel: install-go-tools dashboard-ui split gocov convert coverage | gocov-xml >> coverage.xml;\ @$(FAILPOINT_DISABLE) -test-tso-function: install-go-tools dashboard-ui +test-tso-function: install-go-tools # testing TSO function... @$(DEADLOCK_ENABLE) @$(FAILPOINT_ENABLE) - CGO_ENABLED=1 GO111MODULE=on go test -race -tags tso_function_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; } + CGO_ENABLED=1 GO111MODULE=on go test -race -tags without_dashboard,tso_function_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; } @$(FAILPOINT_DISABLE) @$(DEADLOCK_DISABLE) -test-tso-consistency: install-go-tools dashboard-ui +test-tso-consistency: install-go-tools # testing TSO consistency... @$(DEADLOCK_ENABLE) @$(FAILPOINT_ENABLE) - CGO_ENABLED=1 GO111MODULE=on go test -race -tags tso_consistency_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; } + CGO_ENABLED=1 GO111MODULE=on go test -race -tags without_dashboard,tso_consistency_test $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); $(DEADLOCK_DISABLE); exit 1; } @$(FAILPOINT_DISABLE) @$(DEADLOCK_DISABLE) diff --git a/go.mod b/go.mod index d10441fafd32..d201debd8060 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.16 require ( github.com/AlekSi/gocov-xml v1.0.0 github.com/BurntSushi/toml v0.3.1 - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/aws/aws-sdk-go v1.35.3 github.com/axw/gocov v1.0.0 github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 diff --git a/go.sum b/go.sum index 9e1bd98ee851..6b5f36b99f8d 100644 --- a/go.sum +++ b/go.sum @@ -20,7 +20,6 @@ github.com/VividCortex/mysqlerr v0.0.0-20200629151747-c28746d985dd/go.mod h1:f3H github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502 h1:L8IbaI/W6h5Cwgh0n4zGeZpVK78r/jBf9ASurHo9+/o= github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502/go.mod h1:pmnBM9bxWSiHvC/gSWunUIyDvGn33EkP2CUjxFKtTTM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo=