Skip to content

Commit c4a404d

Browse files
dcorbachodumbbell
authored andcommitted
Use fast and slow targets from new Makefile plugin
References #1136 [#136613953]
1 parent 89aaeec commit c4a404d

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ $(PROJECT).d:: $(EXTRA_SOURCES)
133133
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
134134
rabbit_common/mk/rabbitmq-dist.mk \
135135
rabbit_common/mk/rabbitmq-run.mk \
136+
rabbit_common/mk/rabbitmq-test.mk \
136137
rabbit_common/mk/rabbitmq-tools.mk
137138

138139
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
@@ -144,6 +145,12 @@ ERLANG_MK_COMMIT = rabbitmq-tmp
144145
include rabbitmq-components.mk
145146
include erlang.mk
146147

148+
SLOW_CT_SUITES := $(sort cluster_rename clustering_management dynamic_ha eager_sync health_check partitions priority_queue simple_ha queue_master_location unit_inbroker_backing_queue)
149+
FAST_CT_SUITES := $(filter-out $(SLOW_CT_SUITES),$(CT_SUITES))
150+
151+
ct-fast: CT_SUITES = $(FAST_CT_SUITES)
152+
ct-slow: CT_SUITES = $(SLOW_CT_SUITES)
153+
147154
# --------------------------------------------------------------------
148155
# Compilation.
149156
# --------------------------------------------------------------------

erlang.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6120,8 +6120,6 @@ CT_OPTS ?=
61206120
ifneq ($(wildcard $(TEST_DIR)),)
61216121
ifndef CT_SUITES
61226122
CT_SUITES := $(sort $(subst _SUITE.erl,,$(notdir $(call core_find,$(TEST_DIR)/,*_SUITE.erl))))
6123-
SLOW_CT_SUITES := $(sort cluster_rename clustering_management dynamic_ha eager_sync health_check partitions priority_queue simple_ha queue_master_location unit_inbroker_backing_queue)
6124-
FAST_CT_SUITES := $(filter-out $(SLOW_CT_SUITES),$(CT_SUITES))
61256123
endif
61266124
endif
61276125
CT_SUITES ?=
@@ -6155,12 +6153,6 @@ else
61556153
ct: test-build $(if $(IS_APP),,apps-ct)
61566154
$(verbose) mkdir -p $(CURDIR)/logs/
61576155
$(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS)
6158-
ct-slow: test-build $(if $(IS_APP),,apps-ct)
6159-
$(verbose) mkdir -p $(CURDIR)/logs/
6160-
$(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(SLOW_CT_SUITES)) $(CT_OPTS)
6161-
ct-fast: test-build $(if $(IS_APP),,apps-ct)
6162-
$(verbose) mkdir -p $(CURDIR)/logs/
6163-
$(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(FAST_CT_SUITES)) $(CT_OPTS)
61646156
endif
61656157

61666158
ifneq ($(ALL_APPS_DIRS),)

0 commit comments

Comments
 (0)