Merge pull request #9730 from rabbitmq/mergify/bp/v3.11.x/pr-9728

Use rules_erlang 3.13.1 (backport #9707) (backport #9728)

Author: michaelklishin

.bazelrc

@@ -11,6 +11,8 @@ build --flag_alias=erlang_version=@rules_erlang//:erlang_version
 build --flag_alias=elixir_home=//:elixir_home
 build --flag_alias=test_build=//:enable_test_build
 
+build --combined_report=lcov
+
 build:buildbuddy --bes_results_url=https://app.buildbuddy.io/invocation/
 build:buildbuddy --bes_backend=grpcs://remote.buildbuddy.io
 build:buildbuddy --remote_cache=grpcs://remote.buildbuddy.io

.gitignore

@@ -72,6 +72,7 @@ rebar3.crashdump
 *.lock
 
 /logs/
+/genhtml/
 
 /topic-branch-scratch/
 

MODULE.bazel

@@ -31,7 +31,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rules_erlang",
-    version = "3.12.0",
+    version = "3.13.1",
 )
 
 bazel_dep(

deps/rabbit/BUILD.bazel

@@ -1168,4 +1168,7 @@ eunit(
         ":test_test_rabbit_event_handler_beam",
     ],
     target = ":test_erlang_app",
+    test_env = {
+        "COVERDATA_TO_LCOV_APPS_DIRS": "deps:deps/rabbit/apps",
+    },
 )

rabbitmq.bzl

@@ -173,17 +173,20 @@ def rabbitmq_suite(
         deps = [],
         runtime_deps = [],
         **kwargs):
+    app_name = native.package_name().rpartition("/")[-1]
     # suite_name exists in the underying ct_test macro, but we don't
     # want to use the arg in rabbitmq-server, for the sake of clarity
     if suite_name != None:
         fail("rabbitmq_suite cannot be called with a suite_name attr")
     ct_test(
         name = name,
+        app_name = app_name,
         compiled_suites = [":{}_beam_files".format(name)] + additional_beam,
         data = native.glob(["test/{}_data/**/*".format(name)]) + data,
         test_env = dict({
             "RABBITMQ_CT_SKIP_AS_ERROR": "true",
             "LANG": "C.UTF-8",
+            "COVERDATA_TO_LCOV_APPS_DIRS": "deps:deps/rabbit/apps",
         }.items() + test_env.items()),
         deps = [":test_erlang_app"] + deps + runtime_deps,
         **kwargs
@@ -218,6 +221,7 @@ def rabbitmq_integration_suite(
         deps = [],
         runtime_deps = [],
         **kwargs):
+    app_name = native.package_name().rpartition("/")[-1]
     # suite_name exists in the underying ct_test macro, but we don't
     # want to use the arg in rabbitmq-server, for the sake of clarity
     if suite_name != None:
@@ -236,6 +240,7 @@ def rabbitmq_integration_suite(
 
     ct_test(
         name = name,
+        app_name = app_name,
         suite_name = name,
         compiled_suites = [":{}_beam_files".format(name)] + additional_beam,
         tags = tags + [STARTS_BACKGROUND_BROKER_TAG],
@@ -248,6 +253,7 @@ def rabbitmq_integration_suite(
             "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),
             "LANG": "C.UTF-8",
+            "COVERDATA_TO_LCOV_APPS_DIRS": "deps:deps/rabbit/apps",
         }.items() + test_env.items()),
         tools = [
             ":rabbitmq-for-tests-run",