Skip to content

Commit 7e02d1a

Browse files
committed
Reduce differences
Signed-off-by: Jonh Wendell <jwendell@redhat.com>
1 parent 50a9e3d commit 7e02d1a

File tree

6 files changed

+17
-22
lines changed

6 files changed

+17
-22
lines changed

test/common/quic/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,11 @@ envoy_cc_test_library(
436436
name = "envoy_quic_h3_fuzz_helper_lib",
437437
srcs = envoy_select_enable_http3(["envoy_quic_h3_fuzz_helper.cc"]),
438438
hdrs = ["envoy_quic_h3_fuzz_helper.h"],
439-
deps = envoy_select_enable_http3([
439+
deps = [
440440
":envoy_quic_h3_fuzz_proto_cc_proto",
441441
"//source/common/common:assert_lib",
442442
"@com_github_google_quiche//:quic_test_tools_test_utils_lib",
443-
]),
443+
],
444444
)
445445

446446
envoy_cc_fuzz_test(

test/common/quic/platform/BUILD

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ load(
22
"//bazel:envoy_build_system.bzl",
33
"envoy_cc_test",
44
"envoy_package",
5-
"envoy_select_enable_http3",
65
)
76
load(
87
"quiche.bzl",
@@ -25,7 +24,7 @@ envoy_cc_test(
2524
}),
2625
data = ["//test/common/tls/test_data:certs"],
2726
rbe_pool = "6gig",
28-
deps = envoy_select_enable_http3([
27+
deps = [
2928
"//source/common/memory:stats_lib",
3029
"//source/common/quic/platform:quiche_flags_impl_lib",
3130
"//test/common/buffer:utility_lib",
@@ -44,7 +43,7 @@ envoy_cc_test(
4443
"@com_github_google_quiche//:quic_platform_thread",
4544
"@com_github_google_quiche//:quiche_common_mem_slice_storage",
4645
"@com_github_google_quiche//:quiche_common_platform_system_event_loop",
47-
]),
46+
],
4847
)
4948

5049
envoy_quiche_platform_impl_cc_test_library(

test/extensions/quic/connection_id_generator/quic_lb/BUILD

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,27 @@ envoy_package()
1414

1515
envoy_extension_cc_test(
1616
name = "quic_lb_test",
17-
srcs = ["quic_lb_test.cc"],
17+
srcs = envoy_select_enable_http3(["quic_lb_test.cc"]),
1818
extension_names = ["envoy.quic.connection_id_generator.quic_lb"],
1919
rbe_pool = "6gig",
20-
tags = ["nofips"],
21-
deps = [
20+
deps = envoy_select_enable_http3([
2221
"//source/extensions/quic/connection_id_generator/quic_lb:quic_lb_lib",
2322
"//test/mocks/server:factory_context_mocks",
2423
"@com_github_google_quiche//:quic_test_tools_test_utils_lib",
25-
],
24+
]),
2625
)
2726

2827
envoy_extension_cc_test(
2928
name = "integration_test",
3029
size = "large",
31-
srcs = ["integration_test.cc"],
30+
srcs = envoy_select_enable_http3(["integration_test.cc"]),
3231
extension_names = ["envoy.quic.connection_id_generator.quic_lb"],
3332
rbe_pool = "4core",
34-
tags = ["nofips"],
35-
deps = [
33+
deps = envoy_select_enable_http3([
3634
"//source/extensions/quic/connection_id_generator/quic_lb:quic_lb_config",
3735
"//test/integration:http_integration_lib",
3836
"//test/integration:quic_http_integration_test_lib",
3937
"@envoy_api//envoy/extensions/quic/connection_id_generator/quic_lb/v3:pkg_cc_proto",
4038
"@envoy_api//envoy/extensions/transport_sockets/quic/v3:pkg_cc_proto",
41-
],
39+
]),
4240
)

test/extensions/quic/proof_source/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ envoy_cc_test_library(
1717
"//envoy/registry",
1818
"//source/common/quic:envoy_quic_proof_source_factory_interface",
1919
"//source/common/quic:envoy_quic_proof_source_lib",
20-
]),
20+
],
2121
)

test/integration/BUILD

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2726,10 +2726,10 @@ envoy_cc_test(
27262726

27272727
envoy_cc_test_library(
27282728
name = "quic_http_integration_test_lib",
2729-
hdrs = [
2729+
hdrs = envoy_select_enable_http3([
27302730
"quic_http_integration_test.h",
2731-
],
2732-
deps = [
2731+
]),
2732+
deps = envoy_select_enable_http3([
27332733
":http_integration_lib",
27342734
":socket_interface_swap_lib",
27352735
"//source/common/quic:client_connection_factory_lib",
@@ -2755,8 +2755,7 @@ envoy_cc_test_library(
27552755
"@envoy_api//envoy/extensions/quic/connection_debug_visitor/v3:pkg_cc_proto",
27562756
"@envoy_api//envoy/extensions/quic/server_preferred_address/v3:pkg_cc_proto",
27572757
"@envoy_api//envoy/extensions/transport_sockets/quic/v3:pkg_cc_proto",
2758-
],
2759-
tags = [ "nofips" ],
2758+
]),
27602759
)
27612760

27622761
# TODO(mattklein123): Use target_compatible_with when we switch to Bazel 4.0 instead of multiple
@@ -2783,7 +2782,6 @@ envoy_cc_test(
27832782
"cpu:3",
27842783
"fails_on_clang_cl",
27852784
"fails_on_windows",
2786-
"nofips",
27872785
],
27882786
deps = envoy_select_enable_http3([
27892787
":quic_http_integration_test_lib",

test/integration/python/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ envoy_py_test(
1212
size = "large",
1313
srcs = select({
1414
"//bazel:disable_hot_restart_or_admin": ["null_test.py"],
15-
"//conditions:default": ["null_test.py"],
15+
"//conditions:default": ["hotrestart_handoff_test.py"],
1616
}),
1717
args = [
1818
"--envoy-binary=$(location //test/integration:hotrestart_main)",
@@ -32,7 +32,7 @@ envoy_py_test(
3232
}),
3333
main = select({
3434
"//bazel:disable_hot_restart_or_admin": "null_test.py",
35-
"//conditions:default": "null_test.py",
35+
"//conditions:default": "hotrestart_handoff_test.py",
3636
}),
3737
# Hot restart does not apply on Windows.
3838
# py_test doesn't do coverage.

0 commit comments

Comments
 (0)