mock: revert #838 (remove the br_test build tag)

pingcap · Mar 16, 2021 · ca53dce · ca53dce
1 parent 0cdeca8
commit ca53dce
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -109,14 +109,14 @@ test: export ARGS=$$($(PACKAGES))
 test:
 	$(PREPARE_MOD)
 	@make failpoint-enable
-	$(GOTEST) $(RACEFLAG) -tags br_test,leak $(ARGS) || ( make failpoint-disable && exit 1 )
+	$(GOTEST) $(RACEFLAG) -tags leak $(ARGS) || ( make failpoint-disable && exit 1 )
 	@make failpoint-disable
 
 testcover: tools
 	mkdir -p "$(TEST_DIR)"
 	$(PREPARE_MOD)
 	@make failpoint-enable
-	$(GOTEST) -tags br_test -cover -covermode=count -coverprofile="$(TEST_DIR)/cov.unit.out" \
+	$(GOTEST) -cover -covermode=count -coverprofile="$(TEST_DIR)/cov.unit.out" \
 		$$($(COVERED_PACKAGES)) || ( make failpoint-disable && exit 1 )
 	@make failpoint-disable
 
@@ -183,7 +183,7 @@ static: prepare tools
 	@#   exhaustivestruct - Protobuf structs have hidden fields, like "XXX_NoUnkeyedLiteral"
 	@#         exhaustive - no need to check exhaustiveness of enum switch statements
 	@#              gosec - too many false positive
-	CGO_ENABLED=0 tools/bin/golangci-lint run --enable-all --build-tags br_test --deadline 120s \
+	CGO_ENABLED=0 tools/bin/golangci-lint run --enable-all --deadline 120s \
 		--disable gochecknoglobals \
 		--disable goimports \
 		--disable gofmt \

diff --git a/pkg/mock/backend.go b/pkg/mock/backend.go
diff --git a/pkg/mock/dummy.go b/pkg/mock/dummy.go
diff --git a/pkg/mock/glue.go b/pkg/mock/glue.go
diff --git a/pkg/mock/glue_checkpoint.go b/pkg/mock/glue_checkpoint.go
diff --git a/pkg/mock/importer.go b/pkg/mock/importer.go
diff --git a/pkg/mock/mock_cluster.go b/pkg/mock/mock_cluster.go
@@ -1,7 +1,5 @@
 // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0.
 
-//+build br_test
-
 package mock
 
 import (

diff --git a/pkg/mock/mock_cluster_test.go b/pkg/mock/mock_cluster_test.go
@@ -1,7 +1,5 @@
 // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0.
 
-//+build br_test
-
 package mock_test
 
 import (

diff --git a/pkg/mock/s3iface.go b/pkg/mock/s3iface.go
diff --git a/pkg/mock/storage.go b/pkg/mock/storage.go
diff --git a/tests/README.md b/tests/README.md
@@ -18,15 +18,13 @@ You can also run unit tests directly via `go test` like:
 ```sh
 make failpoint-enable
 
-go test -tags br_test github.com/pingcap/br/pkg/cdclog --test.v --check.v --check.f TestColumn
-#       ^~~~~~~~~~~~~
+go test github.com/pingcap/br/pkg/cdclog --test.v --check.v --check.f TestColumn
 
 make failpoint-disable
 ```
 
 but note that:
 
-* the build-tag `br_test` must be enabled (this workarounds the lack of test-dependencies in go.mod)
 * failpoints must be toggled manually
 
 # Integration tests