From 330aa8acab174030bdca412849efaf2b5549bebb Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Tue, 25 Apr 2023 20:49:58 +0200 Subject: [PATCH] Simplify the reference to RABBITMQ_RUN in bazel in integration tests (cherry picked from commit 3e83c9755ae46b102170669cc872a2435b9c96dc) --- rabbitmq.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rabbitmq.bzl b/rabbitmq.bzl index 7d678b2272a..c2c4a03e78d 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -245,7 +245,7 @@ def rabbitmq_integration_suite( test_env = dict({ "SKIP_MAKE_TEST_DIST": "true", "RABBITMQ_CT_SKIP_AS_ERROR": "true", - "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package), + "RABBITMQ_RUN": "$(location :rabbitmq-for-tests-run)", "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package), "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package), "RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package), @@ -277,7 +277,7 @@ def rabbitmq_integration_suite( "stream_single_active_consumer,direct_exchange_routing_v2,listener_records_in_ets,tracking_records_in_ets", # required starting from 3.12.0 in rabbitmq_management_agent: # empty_basic_get_metric, drop_unroutable_metric - "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/rabbitmq-for-tests-run".format(package), + "RABBITMQ_RUN": "$(location :rabbitmq-for-tests-run)", "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package), "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package), "RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package),