Skip to content

Commit 25d9d30

Browse files
authored
Fix tests that link all extensions so that gcc can compile them (#16187)
Signed-off-by: Yan Avlasov <[email protected]>
1 parent 87d5eb7 commit 25d9d30

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

test/exe/BUILD

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ envoy_cc_test(
6767
],
6868
deps = [
6969
"//source/common/api:api_lib",
70-
"//source/exe:main_common_lib",
70+
"//source/exe:envoy_main_common_with_core_extensions_lib",
7171
"//source/exe:platform_impl_lib",
7272
"//test/mocks/runtime:runtime_mocks",
7373
"//test/test_common:contention_lib",
@@ -79,10 +79,13 @@ envoy_cc_test(
7979
name = "extra_extensions_test",
8080
srcs = ["extra_extensions_test.cc"],
8181
deps = [
82-
# This dependency MUST be main_common_lib to meet the purpose of this test
83-
"//source/exe:main_common_lib",
8482
"//test/test_common:environment_lib",
85-
],
83+
] + select({
84+
# gcc RBE build has trouble compiling target with all extensions
85+
"//bazel:gcc_build": ["//source/exe:envoy_main_common_with_core_extensions_lib"],
86+
# This dependency MUST be main_common_lib to meet the purpose of this test
87+
"//conditions:default": ["//source/exe:main_common_lib"],
88+
}),
8689
)
8790

8891
envoy_cc_test(

0 commit comments

Comments
 (0)