Skip to content

Commit ccc4ccf

Browse files
authored
build: exclude QUIC libraries when HTTP3 is disabled (#42573)
Follows up #41886 Also remove `--build_tests_only` from the CI test so that everything is built and errors like this are caught. Signed-off-by: Jonh Wendell <jwendell@redhat.com>
1 parent 1f29f29 commit ccc4ccf

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

ci/do_ci.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ case $CI_TARGET in
385385
-c fastbuild \
386386
"${TEST_TARGETS[@]}" \
387387
--test_tag_filters=-nofips \
388-
--build_tests_only
388+
--build_tag_filters=-nofips
389389
echo "Building and testing with wasm=wasmtime: and admin_functionality and admin_html disabled ${TEST_TARGETS[*]}"
390390
bazel_with_collection \
391391
test "${BAZEL_BUILD_OPTIONS[@]}" \
@@ -395,7 +395,7 @@ case $CI_TARGET in
395395
-c fastbuild \
396396
"${TEST_TARGETS[@]}" \
397397
--test_tag_filters=-nofips \
398-
--build_tests_only
398+
--build_tag_filters=-nofips
399399
# "--define log_debug_assert_in_release=enabled" must be tested with a release build, so run only
400400
# these tests under "-c opt" to save time in CI.
401401
bazel_with_collection \

test/common/quic/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ envoy_proto_library(
434434

435435
envoy_cc_test_library(
436436
name = "envoy_quic_h3_fuzz_helper_lib",
437-
srcs = ["envoy_quic_h3_fuzz_helper.cc"],
437+
srcs = envoy_select_enable_http3(["envoy_quic_h3_fuzz_helper.cc"]),
438438
hdrs = ["envoy_quic_h3_fuzz_helper.h"],
439439
deps = [
440440
":envoy_quic_h3_fuzz_proto_cc_proto",

test/exe/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ envoy_sh_test(
6969

7070
envoy_cc_test_library(
7171
name = "main_common_test_base_lib",
72-
srcs = ["main_common_test_base.cc"],
72+
srcs = envoy_select_admin_functionality(["main_common_test_base.cc"]),
7373
hdrs = ["main_common_test_base.h"],
7474
data = [
7575
"//test/config/integration:google_com_proxy_port_0",

test/extensions/quic/proof_source/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ load(
22
"//bazel:envoy_build_system.bzl",
33
"envoy_cc_test_library",
44
"envoy_package",
5+
"envoy_select_enable_http3",
56
)
67

78
licenses(["notice"]) # Apache 2
@@ -10,7 +11,7 @@ envoy_package()
1011

1112
envoy_cc_test_library(
1213
name = "pending_proof_source_factory_impl_lib",
13-
srcs = ["pending_proof_source_factory_impl.cc"],
14+
srcs = envoy_select_enable_http3(["pending_proof_source_factory_impl.cc"]),
1415
hdrs = ["pending_proof_source_factory_impl.h"],
1516
deps = [
1617
"//envoy/registry",

0 commit comments

Comments
 (0)