diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2017-03-07 11:41:32 +0000 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-03-09 12:48:53 +0100 |
| commit | c4a404d00ca7dfb496c3fd72ec329491df14218d (patch) | |
| tree | 0b349f1b61c81c06728084f16d9483c4fe08831c | |
| parent | 89aaeec86a89f36509fd9030c0c6f1dc81495a0e (diff) | |
| download | rabbitmq-server-git-c4a404d00ca7dfb496c3fd72ec329491df14218d.tar.gz | |
Use fast and slow targets from new Makefile plugin
References #1136
[#136613953]
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | erlang.mk | 8 |
2 files changed, 7 insertions, 8 deletions
@@ -133,6 +133,7 @@ $(PROJECT).d:: $(EXTRA_SOURCES) DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \ rabbit_common/mk/rabbitmq-dist.mk \ rabbit_common/mk/rabbitmq-run.mk \ + rabbit_common/mk/rabbitmq-test.mk \ rabbit_common/mk/rabbitmq-tools.mk # FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be @@ -144,6 +145,12 @@ ERLANG_MK_COMMIT = rabbitmq-tmp include rabbitmq-components.mk include erlang.mk +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) +FAST_CT_SUITES := $(filter-out $(SLOW_CT_SUITES),$(CT_SUITES)) + +ct-fast: CT_SUITES = $(FAST_CT_SUITES) +ct-slow: CT_SUITES = $(SLOW_CT_SUITES) + # -------------------------------------------------------------------- # Compilation. # -------------------------------------------------------------------- @@ -6120,8 +6120,6 @@ CT_OPTS ?= ifneq ($(wildcard $(TEST_DIR)),) ifndef CT_SUITES CT_SUITES := $(sort $(subst _SUITE.erl,,$(notdir $(call core_find,$(TEST_DIR)/,*_SUITE.erl)))) -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) -FAST_CT_SUITES := $(filter-out $(SLOW_CT_SUITES),$(CT_SUITES)) endif endif CT_SUITES ?= @@ -6155,12 +6153,6 @@ else ct: test-build $(if $(IS_APP),,apps-ct) $(verbose) mkdir -p $(CURDIR)/logs/ $(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) -ct-slow: test-build $(if $(IS_APP),,apps-ct) - $(verbose) mkdir -p $(CURDIR)/logs/ - $(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(SLOW_CT_SUITES)) $(CT_OPTS) -ct-fast: test-build $(if $(IS_APP),,apps-ct) - $(verbose) mkdir -p $(CURDIR)/logs/ - $(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(FAST_CT_SUITES)) $(CT_OPTS) endif ifneq ($(ALL_APPS_DIRS),) |