Skip to content

Commit 98b413e

Browse files
authored
Merge pull request #7992 from rabbitmq/mergify/bp/v3.12.x/pr-7989
Simplify the reference to RABBITMQ_RUN in bazel in integration tests (backport #7989)
2 parents d9f9078 + 330aa8a commit 98b413e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rabbitmq.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def rabbitmq_integration_suite(
245245
test_env = dict({
246246
"SKIP_MAKE_TEST_DIST": "true",
247247
"RABBITMQ_CT_SKIP_AS_ERROR": "true",
248-
"RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package),
248+
"RABBITMQ_RUN": "$(location :rabbitmq-for-tests-run)",
249249
"RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package),
250250
"RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package),
251251
"RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package),
@@ -277,7 +277,7 @@ def rabbitmq_integration_suite(
277277
"stream_single_active_consumer,direct_exchange_routing_v2,listener_records_in_ets,tracking_records_in_ets",
278278
# required starting from 3.12.0 in rabbitmq_management_agent:
279279
# empty_basic_get_metric, drop_unroutable_metric
280-
"RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package),
280+
"RABBITMQ_RUN": "$(location :rabbitmq-for-tests-run)",
281281
"RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package),
282282
"RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package),
283283
"RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package),

0 commit comments

Comments
 (0)