diff --git a/deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl b/deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl index c85c0ded15..8696e4a8b9 100644 --- a/deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl +++ b/deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl @@ -897,7 +897,9 @@ exec([Cmd | Args], Options) when is_list(Cmd) orelse is_binary(Cmd) -> | proplists:delete(env, PortOptions1)], Log ++ "~n~nEnvironment variables:~n" ++ string:join( - [rabbit_misc:format(" ~ts=~ts", [K, V]) || {K, V} <- Env1], + [string:replace( + rabbit_misc:format(" ~ts=~ts", [K, V]), + "~", "~~", all) || {K, V} <- Env1], "~n") } end, diff --git a/rabbitmq.bzl b/rabbitmq.bzl index f397376004..6fc5e4ebc4 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -277,7 +277,13 @@ def rabbitmq_integration_suite( "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), - "RABBITMQ_RUN_SECONDARY": "$TEST_SRCDIR/.secondary_umbrella.rabbitmq-server-generic-unix-3.11/rabbitmq-run", + + # The following variations were observed on different + # versions of bazel and in different environments: + # - _main~secondary_umbrella~rabbitmq-server-generic-unix-3.11 + # - @~secondary_umbrella~rabbitmq-server-generic-unix-3.11 + # - .secondary_umbrella.rabbitmq-server-generic-unix-3.11 + "RABBITMQ_RUN_SECONDARY": "$(ls $TEST_SRCDIR/*secondary_umbrella*rabbitmq-server-generic-unix-3.11/rabbitmq-run)", "LANG": "C.UTF-8", }.items() + test_env.items()), tools = [