Refactor and dedupe .bazel file content

17 files changed, 90 insertions, 332 deletions

diff --git a/deps/amqp10_client/BUILD.bazel b/deps/amqp10_client/BUILD.bazel
index f30c8ca42c..64e8e8fc07 100644
--- a/deps/amqp10_client/BUILD.bazel
+++ b/deps/amqp10_client/BUILD.bazel
@@ -1,8 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "DEFAULT_TEST_ERLC_OPTS", "erlang_lib", "test_erlang_lib")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_NAME = "amqp10_client"
 
@@ -16,10 +15,6 @@ EXTRA_APPS = [
     "crypto",
 ]
 
-TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [
-    "+nowarn_export_all",
-]
-
 BUILD_DEPS = [
     "//deps/rabbit_common:bazel_erlang_lib",
 ]
@@ -28,30 +23,19 @@ DEPS = [
     "//deps/amqp10_common:bazel_erlang_lib",
 ]
 
-erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    extra_apps = EXTRA_APPS,
-    deps = DEPS,
-)
-
-test_erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_module = APP_MODULE,
     app_name = APP_NAME,
     app_version = APP_VERSION,
     build_deps = BUILD_DEPS,
-    erlc_opts = TEST_ERLC_OPTS,
     extra_apps = EXTRA_APPS,
     deps = DEPS,
 )
 
 ct_suite(
     name = "msg_SUITE",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
@@ -86,7 +70,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS + [
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS + [
         "-I deps/amqp10_client",
     ],
     groups = [
diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
index 9467385b74..5170736e9a 100644
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@@ -1,12 +1,12 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlang_lib", "erlc", "test_erlang_lib")
+load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load(
     "//:rabbitmq.bzl",
     "APP_VERSION",
     "RABBITMQ_ERLC_OPTS",
     "RABBITMQ_TEST_ERLC_OPTS",
+    "rabbitmq_lib",
     "rabbitmq_integration_suite",
-    "with_test_versions",
 )
 
 exports_files([
@@ -190,7 +190,7 @@ EXTRA_ERLC_OPTS = [
     "-DINSTR_MOD=gm",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = "RabbitMQ",
     app_env = _APP_ENV,
     app_module = "rabbit",
@@ -198,26 +198,13 @@ erlang_lib(
     app_registered = APP_REGISTERED,
     app_version = APP_VERSION,
     erlc_opts = RABBITMQ_ERLC_OPTS + EXTRA_ERLC_OPTS,
+    test_erlc_opts = RABBITMQ_TEST_ERLC_OPTS + EXTRA_ERLC_OPTS,
     extra_apps = EXTRA_APPS,
     first_srcs = FIRST_SRCS,
     runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
 )
 
-test_erlang_lib(
-    app_description = "RabbitMQ",
-    app_env = _APP_ENV,
-    app_module = "rabbit",
-    app_name = "rabbit",
-    app_registered = APP_REGISTERED,
-    app_version = APP_VERSION,
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS + EXTRA_ERLC_OPTS,
-    extra_apps = EXTRA_APPS,
-    first_srcs = FIRST_SRCS,
-    runtime_deps = with_test_versions(RUNTIME_DEPS),
-    deps = with_test_versions(DEPS),
-)
-
 erlc(
     name = "quorum_queue_utils",
     srcs = [
diff --git a/deps/rabbitmq_amqp1_0/BUILD.bazel b/deps/rabbitmq_amqp1_0/BUILD.bazel
index 4e0da4cb8a..4adb1ccfb7 100644
--- a/deps/rabbitmq_amqp1_0/BUILD.bazel
+++ b/deps/rabbitmq_amqp1_0/BUILD.bazel
@@ -1,8 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlang_lib", "test_erlang_lib")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_ENV = """[
 	    {default_user, "guest"},
@@ -28,7 +27,7 @@ RUNTIME_DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_name = APP_NAME,
@@ -38,20 +37,6 @@ erlang_lib(
     deps = DEPS,
 )
 
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_env = APP_ENV,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-TEST_ERLC_OPTS = [
-    "+nowarn_export_all",
-]
-
 rabbitmq_home(
     name = "broker-for-tests-home",
     plugins = [
@@ -71,7 +56,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/rabbitmq-for-tests-run",
@@ -99,7 +84,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/rabbitmq-for-tests-run",
@@ -127,7 +112,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/rabbitmq-for-tests-run",
@@ -151,7 +136,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     groups = [
         "dotnet",
         "java",
@@ -182,7 +167,7 @@ ct_suite(
 
 ct_suite(
     name = "unit_SUITE",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     deps = [
         "//deps/amqp10_common:bazel_erlang_lib",
     ],
diff --git a/deps/rabbitmq_auth_backend_cache/BUILD.bazel b/deps/rabbitmq_auth_backend_cache/BUILD.bazel
index 178f9fddba..459300dbab 100644
--- a/deps/rabbitmq_auth_backend_cache/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_cache/BUILD.bazel
@@ -1,8 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "DEFAULT_TEST_ERLC_OPTS", "erlang_lib", "test_erlang_lib")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_ENV = """[
 	    {cache_ttl,      15000},
@@ -30,7 +29,7 @@ FIRST_SRCS = [
     "src/rabbit_auth_cache.erl",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_module = APP_MODULE,
@@ -41,21 +40,6 @@ erlang_lib(
     deps = DEPS,
 )
 
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_env = APP_ENV,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    first_srcs = FIRST_SRCS,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [
-    "+nowarn_export_all",
-]
-
 rabbitmq_home(
     name = "broker-for-tests-home",
     plugins = [
@@ -75,7 +59,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_cache/rabbitmq-for-tests-run",
@@ -99,7 +83,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_cache/rabbitmq-for-tests-run",
@@ -121,7 +105,7 @@ ct_suite(
 
 ct_suite(
     name = "rabbit_auth_cache_SUITE",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
diff --git a/deps/rabbitmq_auth_backend_http/BUILD.bazel b/deps/rabbitmq_auth_backend_http/BUILD.bazel
index f797f11311..fed45ed136 100644
--- a/deps/rabbitmq_auth_backend_http/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_http/BUILD.bazel
@@ -1,8 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "DEFAULT_TEST_ERLC_OPTS", "erlang_lib", "test_erlang_lib")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_ENV = """[
 	    {http_method,   get},
@@ -31,7 +30,7 @@ RUNTIME_DEPS = [
     "//deps/amqp_client:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_module = APP_MODULE,
@@ -42,20 +41,6 @@ erlang_lib(
     deps = DEPS,
 )
 
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_env = APP_ENV,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [
-    "+nowarn_export_all",
-]
-
 rabbitmq_home(
     name = "broker-for-tests-home",
     plugins = [
@@ -75,7 +60,7 @@ ct_suite(
     additional_srcs = [
         "test/auth_http_mock.erl",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
@@ -93,7 +78,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_http/rabbitmq-for-tests-run",
@@ -114,7 +99,7 @@ ct_suite(
 ct_suite(
     name = "unit_SUITE",
     size = "small",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
diff --git a/deps/rabbitmq_auth_backend_ldap/BUILD.bazel b/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
index 2edddf68e6..fa72e3da37 100644
--- a/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
@@ -1,8 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "DEFAULT_TEST_ERLC_OPTS", "erlang_lib", "test_erlang_lib")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_ENV = """[
 	    {servers,               undefined},
@@ -46,7 +45,7 @@ RUNTIME_DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_module = APP_MODULE,
@@ -57,20 +56,6 @@ erlang_lib(
     deps = DEPS,
 )
 
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_env = APP_ENV,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [
-    "+nowarn_export_all",
-]
-
 rabbitmq_home(
     name = "broker-for-tests-home",
     plugins = [
@@ -90,7 +75,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_ldap/rabbitmq-for-tests-run",
@@ -122,7 +107,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     tags = [
         "ldap",
     ],
@@ -150,7 +135,7 @@ ct_suite(
 ct_suite(
     name = "unit_SUITE",
     size = "small",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
diff --git a/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel b/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
index cc9bb4e9f8..409237780b 100644
--- a/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
@@ -1,14 +1,8 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "DEFAULT_TEST_ERLC_OPTS",
-    "erlang_lib",
-    "erlc",
-    "test_erlang_lib",
-)
+load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_NAME = "rabbitmq_auth_backend_oauth2"
 
@@ -28,7 +22,7 @@ RUNTIME_DEPS = [
     "@cowlib//:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_name = APP_NAME,
     app_version = APP_VERSION,
@@ -37,19 +31,6 @@ erlang_lib(
     deps = DEPS,
 )
 
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [
-    "+nowarn_export_all",
-]
-
 rabbitmq_home(
     name = "broker-for-tests-home",
     plugins = [
@@ -68,7 +49,7 @@ erlc(
     srcs = [
         "test/rabbit_auth_backend_oauth2_test_util.erl",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
 )
 
 ct_suite(
@@ -78,7 +59,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_oauth2/rabbitmq-for-tests-run",
@@ -97,7 +78,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_oauth2/rabbitmq-for-tests-run",
@@ -129,7 +110,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_oauth2/rabbitmq-for-tests-run",
@@ -155,7 +136,7 @@ ct_suite(
 ct_suite(
     name = "scope_SUITE",
     size = "small",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
@@ -174,7 +155,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_auth_backend_oauth2/rabbitmq-for-tests-run",
@@ -190,7 +171,7 @@ ct_suite(
 ct_suite(
     name = "wildcard_match_SUITE",
     size = "small",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
diff --git a/deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel b/deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
index 5ee1e3ac76..8b4a1a7c87 100644
--- a/deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
+++ b/deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
@@ -1,8 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlang_lib")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_NAME = "rabbitmq_auth_mechanism_ssl"
 
@@ -22,7 +21,7 @@ RUNTIME_DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_module = APP_MODULE,
diff --git a/deps/rabbitmq_aws/BUILD.bazel b/deps/rabbitmq_aws/BUILD.bazel
index bf11bd18ca..52255cee36 100644
--- a/deps/rabbitmq_aws/BUILD.bazel
+++ b/deps/rabbitmq_aws/BUILD.bazel
@@ -1,11 +1,5 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "DEFAULT_TEST_ERLC_OPTS",
-    "erlang_lib",
-    "test_erlang_lib",
-)
 load("@bazel-erlang//:eunit.bzl", "eunit")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_NAME = "rabbitmq_aws"
 
@@ -28,17 +22,7 @@ BUILD_DEPS = [
     "//deps/rabbit_common:bazel_erlang_lib",
 ]
 
-erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_registered = APP_REGISTERED,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    extra_apps = EXTRA_APPS,
-)
-
-test_erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_module = APP_MODULE,
     app_name = APP_NAME,
@@ -49,7 +33,7 @@ test_erlang_lib(
 )
 
 eunit(
-    erlc_opts = DEFAULT_TEST_ERLC_OPTS + [
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS + [
         "-I deps/rabbitmq_aws",
         "+nowarn_export_all",
     ],
diff --git a/deps/rabbitmq_consistent_hash_exchange/BUILD.bazel b/deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
index ea78618c52..a657c6c5c4 100644
--- a/deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
+++ b/deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
@@ -1,8 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "DEFAULT_TEST_ERLC_OPTS", "erlang_lib", "test_erlang_lib")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_NAME = "rabbitmq_consistent_hash_exchange"
 
@@ -20,7 +19,7 @@ RUNTIME_DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_name = APP_NAME,
     app_version = APP_VERSION,
@@ -29,19 +28,6 @@ erlang_lib(
     deps = DEPS,
 )
 
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [
-    "+nowarn_export_all",
-]
-
 rabbitmq_home(
     name = "broker-for-tests-home",
     plugins = [
@@ -61,7 +47,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_consistent_hash_exchange/rabbitmq-for-tests-run",
diff --git a/deps/rabbitmq_event_exchange/BUILD.bazel b/deps/rabbitmq_event_exchange/BUILD.bazel
index a550b7c180..d10fe7ef6d 100644
--- a/deps/rabbitmq_event_exchange/BUILD.bazel
+++ b/deps/rabbitmq_event_exchange/BUILD.bazel
@@ -1,13 +1,7 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "DEFAULT_TEST_ERLC_OPTS",
-    "erlang_lib",
-    "test_erlang_lib",
-)
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION")
+load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
 
 APP_NAME = "rabbitmq_event_exchange"
 
@@ -21,23 +15,10 @@ DEPS = [
 RUNTIME_DEPS = [
 ]
 
-erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [
-    "+nowarn_export_all",
-]
-
-test_erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_name = APP_NAME,
     app_version = APP_VERSION,
-    erlc_opts = TEST_ERLC_OPTS,
     runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
 )
@@ -61,7 +42,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_event_exchange/rabbitmq-for-tests-run",
@@ -85,7 +66,7 @@ ct_suite(
         "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
         "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
     ],
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
         "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_event_exchange/rabbitmq-for-tests-run",
@@ -109,7 +90,7 @@ ct_suite(
 
 ct_suite(
     name = "unit_SUITE",
-    erlc_opts = TEST_ERLC_OPTS,
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     test_env = {
         "RABBITMQ_CT_SKIP_AS_ERROR": "true",
     },
diff --git a/deps/rabbitmq_federation/BUILD.bazel b/deps/rabbitmq_federation/BUILD.bazel
index 5cb9fd91f4..9b8a3248ec 100644
--- a/deps/rabbitmq_federation/BUILD.bazel
+++ b/deps/rabbitmq_federation/BUILD.bazel
@@ -1,10 +1,4 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "DEFAULT_TEST_ERLC_OPTS",
-    "erlang_lib",
-    "erlc",
-    "test_erlang_lib",
-)
+load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
@@ -13,6 +7,7 @@ load(
     "APP_VERSION",
     "RABBITMQ_ERLC_OPTS",
     "RABBITMQ_TEST_ERLC_OPTS",
+    "rabbitmq_lib",
 )
 
 APP_NAME = "rabbitmq_federation"
@@ -36,25 +31,13 @@ DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
 
-erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_env = APP_ENV,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    erlc_opts = RABBITMQ_ERLC_OPTS,
-    deps = DEPS,
-)
-
-test_erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_module = APP_MODULE,
     app_name = APP_NAME,
     app_version = APP_VERSION,
     build_deps = BUILD_DEPS,
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     deps = DEPS,
 )
 
diff --git a/deps/rabbitmq_federation_management/BUILD.bazel b/deps/rabbitmq_federation_management/BUILD.bazel
index 032ecf05e5..3ca7e7d440 100644
--- a/deps/rabbitmq_federation_management/BUILD.bazel
+++ b/deps/rabbitmq_federation_management/BUILD.bazel
@@ -1,10 +1,4 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "DEFAULT_TEST_ERLC_OPTS",
-    "erlang_lib",
-    "erlc",
-    "test_erlang_lib",
-)
+load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
@@ -13,6 +7,7 @@ load(
     "APP_VERSION",
     "RABBITMQ_ERLC_OPTS",
     "RABBITMQ_TEST_ERLC_OPTS",
+    "rabbitmq_lib",
 )
 
 APP_NAME = "rabbitmq_federation_management"
@@ -36,24 +31,12 @@ RUNTIME_DEPS = [
     "//deps/rabbitmq_federation:bazel_erlang_lib",
 ]
 
-erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    erlc_opts = RABBITMQ_ERLC_OPTS,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-test_erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_module = APP_MODULE,
     app_name = APP_NAME,
     app_version = APP_VERSION,
     build_deps = BUILD_DEPS,
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
 )
diff --git a/deps/rabbitmq_jms_topic_exchange/BUILD.bazel b/deps/rabbitmq_jms_topic_exchange/BUILD.bazel
index f75b9ab612..4d33441804 100644
--- a/deps/rabbitmq_jms_topic_exchange/BUILD.bazel
+++ b/deps/rabbitmq_jms_topic_exchange/BUILD.bazel
@@ -1,8 +1,3 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "erlang_lib",
-    "test_erlang_lib",
-)
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
@@ -11,6 +6,7 @@ load(
     "APP_VERSION",
     "RABBITMQ_ERLC_OPTS",
     "RABBITMQ_TEST_ERLC_OPTS",
+    "rabbitmq_lib",
 )
 
 APP_NAME = "rabbitmq_jms_topic_exchange"
@@ -27,22 +23,11 @@ RUNTIME_DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_module = APP_MODULE,
     app_name = APP_NAME,
     app_version = APP_VERSION,
-    erlc_opts = RABBITMQ_ERLC_OPTS,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
 )
diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel
index 2e7a99de66..17852df43f 100644
--- a/deps/rabbitmq_management/BUILD.bazel
+++ b/deps/rabbitmq_management/BUILD.bazel
@@ -1,9 +1,4 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "erlang_lib",
-    "erlc",
-    "test_erlang_lib",
-)
+load( "@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
@@ -12,6 +7,7 @@ load(
     "APP_VERSION",
     "RABBITMQ_ERLC_OPTS",
     "RABBITMQ_TEST_ERLC_OPTS",
+    "rabbitmq_lib"
 )
 
 APP_NAME = "rabbitmq_management"
@@ -57,26 +53,12 @@ RUNTIME_DEPS = [
     "@cowlib//:bazel_erlang_lib",
 ]
 
-erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_env = APP_ENV,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    erlc_opts = RABBITMQ_ERLC_OPTS,
-    extra_apps = EXTRA_APPS,
-    first_srcs = FIRST_SRCS,
-    runtime_deps = RUNTIME_DEPS,
-    deps = DEPS,
-)
-
-test_erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_module = APP_MODULE,
     app_name = APP_NAME,
     app_version = APP_VERSION,
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     extra_apps = EXTRA_APPS,
     first_srcs = FIRST_SRCS,
     runtime_deps = RUNTIME_DEPS,
diff --git a/deps/rabbitmq_management_agent/BUILD.bazel b/deps/rabbitmq_management_agent/BUILD.bazel
index 523705922f..e3d5e5b19c 100644
--- a/deps/rabbitmq_management_agent/BUILD.bazel
+++ b/deps/rabbitmq_management_agent/BUILD.bazel
@@ -1,9 +1,4 @@
-load(
-    "@bazel-erlang//:bazel_erlang_lib.bzl",
-    "erlang_lib",
-    "erlc",
-    "test_erlang_lib",
-)
+load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
@@ -12,6 +7,7 @@ load(
     "APP_VERSION",
     "RABBITMQ_ERLC_OPTS",
     "RABBITMQ_TEST_ERLC_OPTS",
+    "rabbitmq_lib",
 )
 
 APP_ENV = """[
@@ -47,26 +43,13 @@ DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
 
-erlang_lib(
+rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_env = APP_ENV,
     app_module = APP_MODULE,
     app_name = APP_NAME,
     app_version = APP_VERSION,
     build_deps = BUILD_DEPS,
-    erlc_opts = RABBITMQ_ERLC_OPTS,
-    extra_apps = EXTRA_APPS,
-    deps = DEPS,
-)
-
-test_erlang_lib(
-    app_description = APP_DESCRIPTION,
-    app_env = APP_ENV,
-    app_module = APP_MODULE,
-    app_name = APP_NAME,
-    app_version = APP_VERSION,
-    build_deps = BUILD_DEPS,
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     extra_apps = EXTRA_APPS,
     deps = DEPS,
 )
diff --git a/rabbitmq.bzl b/rabbitmq.bzl
index b0a77e7fb6..3f9102c53c 100644
--- a/rabbitmq.bzl
+++ b/rabbitmq.bzl
@@ -27,6 +27,22 @@ def management_plugins(rabbitmq_workspace = "@rabbitmq-server"):
         rabbitmq_workspace + "//deps/rabbitmq_management:bazel_erlang_lib",
     ]
 
+LABELS_WITH_TEST_VERSIONS = [
+    "//deps/amqp10_common:bazel_erlang_lib",
+    "//deps/rabbit_common:bazel_erlang_lib",
+    "//deps/rabbit:bazel_erlang_lib",
+    "//deps/rabbit/apps/rabbitmq_prelaunch:bazel_erlang_lib",
+]
+
+def with_test_versions(deps):
+    r = []
+    for d in deps:
+        if d in LABELS_WITH_TEST_VERSIONS:
+            r.append(d.replace(":bazel_erlang_lib", ":test_bazel_erlang_lib"))
+        else:
+            r.append(d)
+    return r
+
 def rabbitmq_lib(
         app_name = "",
         app_version = APP_VERSION,
@@ -35,7 +51,8 @@ def rabbitmq_lib(
         app_registered = [],
         app_env = "[]",
         extra_apps = [],
-        extra_erlc_opts = [],
+        erlc_opts = RABBITMQ_ERLC_OPTS,
+        test_erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
         first_srcs = [],
         build_deps = [],
         deps = [],
@@ -48,7 +65,7 @@ def rabbitmq_lib(
         app_registered = app_registered,
         app_env = app_env,
         extra_apps = extra_apps,
-        erlc_opts = RABBITMQ_ERLC_OPTS + extra_erlc_opts,
+        erlc_opts = erlc_opts,
         first_srcs = first_srcs,
         build_deps = build_deps,
         deps = deps,
@@ -63,11 +80,11 @@ def rabbitmq_lib(
         app_registered = app_registered,
         app_env = app_env,
         extra_apps = extra_apps,
-        erlc_opts = RABBITMQ_TEST_ERLC_OPTS + extra_erlc_opts,
+        erlc_opts = test_erlc_opts,
         first_srcs = first_srcs,
-        build_deps = build_deps,
-        deps = deps,
-        runtime_deps = runtime_deps,
+        build_deps = with_test_versions(build_deps),
+        deps = with_test_versions(deps),
+        runtime_deps = with_test_versions(runtime_deps),
     )
 
 def rabbitmq_integration_suite(
@@ -104,19 +121,3 @@ def rabbitmq_integration_suite(
         ] + deps,
         **kwargs
     )
-
-LABELS_WITH_TEST_VERSIONS = [
-    "//deps/amqp10_common:bazel_erlang_lib",
-    "//deps/rabbit_common:bazel_erlang_lib",
-    "//deps/rabbit:bazel_erlang_lib",
-    "//deps/rabbit/apps/rabbitmq_prelaunch:bazel_erlang_lib",
-]
-
-def with_test_versions(deps):
-    r = []
-    for d in deps:
-        if d in LABELS_WITH_TEST_VERSIONS:
-            r.append(d.replace(":bazel_erlang_lib", ":test_bazel_erlang_lib"))
-        else:
-            r.append(d)
-    return r