diff options
| author | Rin Kuryloski <kuryloskip@vmware.com> | 2023-04-26 09:29:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-26 09:29:52 +0200 |
| commit | 93d53dc4666836c5f9e26cdc045e611f06e60a0b (patch) | |
| tree | e6dba1251015ced92474c5970a134d618d134077 | |
| parent | 4babbb2abc8bfb94b1237cac35c88bea370fd226 (diff) | |
| parent | 3e83c9755ae46b102170669cc872a2435b9c96dc (diff) | |
| download | rabbitmq-server-git-93d53dc4666836c5f9e26cdc045e611f06e60a0b.tar.gz | |
Merge pull request #7989 from rabbitmq/rin/simplify-rabbitmq-run-reference-bazel
Simplify the reference to RABBITMQ_RUN in bazel in integration tests
| -rw-r--r-- | rabbitmq.bzl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rabbitmq.bzl b/rabbitmq.bzl index 7cf2678434..d316d5cf1a 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), |