Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Commit 297861c

Browse files
committed
rabbitmq-early-test.mk: Include $(RMQ_CI_CT_HOOKS) in TEST_DEPS
... the target is *-on-concourse. This fixes the make recipe because the dependency might be missing on the host, which caused fly(1) to complain because the specified input was not there. This makes the loop on `$(RMQ_CI_CT_HOOKS)` useless in rabbitmq-test.mk, because those inputs are handled with the previous loop on TEST_DEPS. [#146078591]
1 parent dbef854 commit 297861c

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

mk/rabbitmq-early-test.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# --------------------------------------------------------------------
44

55
ifneq ($(words $(filter %-on-concourse,$(MAKECMDGOALS))),0)
6-
TEST_DEPS += ci
6+
TEST_DEPS += ci $(RMQ_CI_CT_HOOKS)
77
dep_ci = git [email protected]:rabbitmq/rabbitmq-ci master
88
endif
99

mk/rabbitmq-test.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ $(CONCOURSE_TASK): $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST)
3030
$(verbose) cat $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST) | while read -r file; do \
3131
echo " - name: $$(basename "$$file")" >> "$@"; \
3232
done
33-
$(verbose) $(foreach hook,$(RMQ_CI_CT_HOOKS), \
34-
echo ' - name: $(hook)' >> "$@")
3533
$(verbose) echo 'outputs:' >> "$@"
3634
$(verbose) echo ' - name: test-output' >> "$@"
3735
ifeq ($(CONCOURSE_PLATFORM),linux)

0 commit comments

Comments
 (0)