Skip to content

Commit 23705c1

Browse files
hawkingreiReminiscent
authored andcommitted
bazel: use bazel to run failpoint (pingcap#65251)
1 parent 084304b commit 23705c1

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,10 @@ failpoint-disable: tools/bin/failpoint-ctl
340340
# Restoring gofail failpoints...
341341
@$(FAILPOINT_DISABLE)
342342

343+
.PHONY: bazel_failpoint-enable
344+
bazel-failpoint-enable:
345+
find $$PWD/ -mindepth 1 -type d | grep -vE "(\.git|\.idea|tools)" | xargs bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) @com_github_pingcap_failpoint//failpoint-ctl:failpoint-ctl -- enable
346+
343347
.PHONY: tools/bin/ut
344348
tools/bin/ut: tools/check/ut.go tools/check/longtests.go
345349
cd tools/check; \
@@ -676,21 +680,21 @@ check-bazel-prepare:
676680
./tools/check/check-bazel-prepare.sh
677681

678682
.PHONY: bazel_test
679-
bazel_test: failpoint-enable bazel_prepare ## Run all tests using Bazel
683+
bazel_test: bazel-failpoint-enable bazel_prepare ## Run all tests using Bazel
680684
bazel $(BAZEL_GLOBAL_CONFIG) test $(BAZEL_CMD_CONFIG) --build_tests_only --test_keep_going=false \
681685
--define gotags=$(UNIT_TEST_TAGS) \
682686
-- //... -//cmd/... -//tests/graceshutdown/... \
683687
-//tests/globalkilltest/... -//tests/readonlytest/... -//tests/realtikvtest/...
684688

685689
.PHONY: bazel_coverage_test
686-
bazel_coverage_test: failpoint-enable bazel_ci_simple_prepare
690+
bazel_coverage_test: bazel-failpoint-enable bazel_ci_simple_prepare
687691
bazel $(BAZEL_GLOBAL_CONFIG) --nohome_rc coverage $(BAZEL_CMD_CONFIG) $(BAZEL_INSTRUMENTATION_FILTER) --jobs=35 --build_tests_only --test_keep_going=false \
688692
--@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=$(UNIT_TEST_TAGS) \
689693
-- //... -//cmd/... -//tests/graceshutdown/... \
690694
-//tests/globalkilltest/... -//tests/readonlytest/... -//tests/realtikvtest/...
691695

692696
.PHONY: bazel_coverage_test_ddlargsv1
693-
bazel_coverage_test_ddlargsv1: failpoint-enable bazel_ci_simple_prepare
697+
bazel_coverage_test_ddlargsv1: bazel-failpoint-enable bazel_ci_simple_prepare
694698
bazel $(BAZEL_GLOBAL_CONFIG) --nohome_rc coverage $(BAZEL_CMD_CONFIG) $(BAZEL_INSTRUMENTATION_FILTER) --jobs=35 --build_tests_only --test_keep_going=false \
695699
--@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=$(UNIT_TEST_TAGS),ddlargsv1 \
696700
-- //... -//cmd/... -//tests/graceshutdown/... \

0 commit comments

Comments
 (0)