Skip to content

Commit a703c42

Browse files
dumbbellmergify[bot]
authored andcommitted
rabbitmq_cli: Use make start-background-broker to start test node
[Why] The `run-background-broker` does not wait for the node to be ready, leading to some transient errors in the testsuite. [How] The `start-background-broker` does wait. While here, export the value of `$(MAKE)`. Otherwise, nested uses of make(1) may use the wrong make command. (cherry picked from commit e480513)
1 parent 51197ab commit a703c42

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

deps/rabbitmq_cli/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ ifeq ($(VERBOSE_TEST),true)
2727
MIX_TEST := $(MIX_TEST) --trace
2828
endif
2929

30+
export MAKE
31+
3032
include ../../rabbitmq-components.mk
3133
include ../../erlang.mk
3234

@@ -114,7 +116,7 @@ rel:: $(ESCRIPTS)
114116

115117
tests:: $(ESCRIPTS)
116118
$(verbose) $(MAKE) -C ../../ install-cli
117-
$(verbose) $(MAKE) -C ../../ run-background-broker PLUGINS="rabbit rabbitmq_federation rabbitmq_stomp rabbitmq_stream_management amqp_client"
119+
$(verbose) $(MAKE) -C ../../ start-background-broker PLUGINS="rabbit rabbitmq_federation rabbitmq_stomp rabbitmq_stream_management amqp_client"
118120
$(gen_verbose) $(MIX_TEST) $(TEST_FILE); \
119121
RES=$$?; \
120122
$(MAKE) -C ../../ stop-node; \

0 commit comments

Comments
 (0)