Skip to content

Commit

Permalink
Merge branch 'rtf' into up-rtf
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctiller
ctiller committed Jan 27, 2025
2 parents 1052731 + 2a31d44 commit 8ad4013
Show file tree
Hide file tree
Showing 277 changed files with 6,919 additions and 106,389 deletions.
9,112 changes: 1,424 additions & 7,688 deletions CMakeLists.txt
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion bazel/grpc_build_system.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,12 +574,13 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
experiment_config.append(config)
return experiment_config

def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, size = "medium", timeout = None, tags = [], exec_compatible_with = [], exec_properties = {}, shard_count = None, flaky = None, copts = [], linkstatic = None, exclude_pollers = [], uses_event_engine = True):
def grpc_cc_test(name, srcs = [], defines = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, size = "medium", timeout = None, tags = [], exec_compatible_with = [], exec_properties = {}, shard_count = None, flaky = None, copts = [], linkstatic = None, exclude_pollers = [], uses_event_engine = True):
"""A cc_test target for use in the gRPC repo.
Args:
name: The name of the test.
srcs: The source files.
defines: Build defines to use.
deps: The target deps.
external_deps: The external deps.
args: The args to supply to the test binary.
Expand Down Expand Up @@ -631,6 +632,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
testonly = 1,
srcs = srcs,
deps = core_deps,
defines = defines,
tags = tags,
alwayslink = 1,
)
Expand Down
15,906 changes: 4,602 additions & 11,304 deletions build_autogenerated.yaml
View file

Large diffs are not rendered by default.

170 changes: 28 additions & 142 deletions test/core/end2end/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,45 +113,12 @@ grpc_cc_library(
name = "end2end_test_lib",
testonly = 1,
srcs = [
"end2end_test_suites.cc",
"end2end_tests.cc",
"fixtures/local_util.cc",
],
hdrs = [
"end2end_tests.h",
],
external_deps = [
"absl/functional:any_invocable",
"absl/log:check",
"absl/log:log",
"absl/memory",
"absl/meta:type_traits",
"absl/random",
"absl/strings",
"gtest",
],
deps = [
"cq_verifier",
"//:config",
"//:debug_location",
"//:gpr",
"//:grpc",
"//:grpc_public_hdrs",
"//src/core:bitset",
"//src/core:channel_args",
"//src/core:default_event_engine",
"//src/core:no_destruct",
"//src/core:slice",
"//src/core:time",
"//test/core/call:batch_builder",
"//test/core/event_engine:event_engine_test_utils",
"//test/core/test_util:grpc_test_util",
],
)

grpc_cc_library(
name = "fixture_support",
testonly = 1,
srcs = ["fixtures/local_util.cc"],
hdrs = [
"fixtures/h2_oauth2_common.h",
"fixtures/h2_ssl_cred_reload_fixture.h",
"fixtures/h2_ssl_tls_common.h",
Expand All @@ -165,117 +132,34 @@ grpc_cc_library(
external_deps = [
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
"gtest",
],
deps = [
"end2end_test_lib",
"//:channel_arg_names",
"//:config",
"//:exec_ctx",
"//:gpr",
"//:grpc",
"//:grpc_public_hdrs",
"//:grpc_security_base",
"//:grpc_transport_chttp2",
"//:ref_counted_ptr",
"//src/core:channel_args",
"//src/core:channel_args_preconditioning",
"//src/core:channel_stack_type",
"//src/core:error",
"//src/core:grpc_ssl_credentials",
"//src/core:grpc_tls_credentials",
"//src/core:grpc_transport_inproc",
"//src/core:slice",
"//test/core/test_util:grpc_test_util",
],
)

grpc_cc_library(
name = "end2end_test_suites",
testonly = 1,
srcs = [
"end2end_test_suites.cc",
],
external_deps = [
"absl/base:core_headers",
"absl/functional:any_invocable",
"absl/log:check",
"absl/log:log",
"absl/memory",
"absl/meta:type_traits",
"absl/random",
"absl/status",
"absl/strings:str_format",
"absl/strings",
"gtest",
"fuzztest",
],
deps = [
"end2end_test_lib",
"fixture_support",
"cq_verifier",
"end2end_test_fuzzer_cc_proto",
"http_proxy",
"proxy",
"//:channel_arg_names",
"//:exec_ctx",
"//:config",
"//:debug_location",
"//:gpr",
"//:grpc",
"//:grpc_public_hdrs",
"//:grpc_trace",
"//src/core:bitset",
"//src/core:channel_args",
"//src/core:chaotic_good_connector",
"//src/core:chaotic_good_server",
"//src/core:env",
"//src/core:error",
"//src/core:grpc_fake_credentials",
"//src/core:iomgr_port",
"//src/core:default_event_engine",
"//src/core:no_destruct",
"//test/core/test_util:grpc_test_util",
],
alwayslink = 1,
)

grpc_cc_library(
name = "end2end_test_main",
testonly = 1,
srcs = [
"end2end_test_main.cc",
],
external_deps = [
"absl/functional:any_invocable",
"absl/strings",
"gtest",
],
tags = ["nofixdeps"],
deps = [
"end2end_test_lib",
"end2end_test_suites",
"fixture_support",
"//:config_vars",
"//test/core/test_util:grpc_test_util",
],
)

grpc_cc_library(
name = "end2end_test_fuzzer",
testonly = 1,
srcs = [
"end2end_test_fuzzer.cc",
],
hdrs = [
"end2end_test_fuzzer.h",
],
external_deps = [
"absl/functional:any_invocable",
"absl/log:check",
"absl/strings",
"gtest",
],
tags = ["nofixdeps"],
deps = [
"end2end_test_fuzzer_cc_proto",
"end2end_test_lib",
"end2end_test_suites",
"fixture_support",
"//:config_vars",
"//src/core:slice",
"//src/core:time",
"//test/core/call:batch_builder",
"//test/core/event_engine:event_engine_test_utils",
"//test/core/event_engine/fuzzing_event_engine",
"//test/core/test_util:fuzz_config_vars",
"//test/core/test_util:grpc_test_util",
Expand All @@ -292,23 +176,23 @@ grpc_core_end2end_test(name = "call_host_override")

grpc_core_end2end_test(
name = "cancel_after_accept",
shard_count = 50,
shard_count = 5,
)

grpc_core_end2end_test(
name = "cancel_after_client_done",
shard_count = 50,
shard_count = 5,
)

grpc_core_end2end_test(
name = "cancel_after_invoke",
flaky = True,
shard_count = 50,
shard_count = 5,
)

grpc_core_end2end_test(
name = "cancel_after_round_trip",
shard_count = 50,
shard_count = 5,
)

grpc_core_end2end_test(name = "cancel_before_invoke")
Expand Down Expand Up @@ -349,12 +233,12 @@ grpc_core_end2end_test(name = "grpc_authz")

grpc_core_end2end_test(
name = "high_initial_seqno",
shard_count = 20,
shard_count = 5,
)

grpc_core_end2end_test(
name = "hpack_size",
shard_count = 50,
shard_count = 10,
)

grpc_core_end2end_test(name = "http2_stats")
Expand All @@ -365,7 +249,7 @@ grpc_core_end2end_test(name = "keepalive_timeout")

grpc_core_end2end_test(
name = "large_metadata",
shard_count = 50,
shard_count = 5,
)

grpc_core_end2end_test(name = "max_concurrent_streams")
Expand All @@ -388,13 +272,16 @@ grpc_core_end2end_test(name = "ping")

grpc_core_end2end_test(name = "ping_pong_streaming")

grpc_core_end2end_test(name = "proxy_auth")
grpc_core_end2end_test(
name = "proxy_auth",
enable_fuzzing = False,
)

grpc_core_end2end_test(name = "registered_call")

grpc_core_end2end_test(
name = "request_with_flags",
shard_count = 50,
shard_count = 10,
)

grpc_core_end2end_test(name = "request_with_payload")
Expand Down Expand Up @@ -666,7 +553,6 @@ grpc_cc_test(
deps = [
"cq_verifier",
"end2end_test_lib",
"fixture_support",
"ssl_test_data",
"//:channel_arg_names",
"//:config_vars",
Expand Down
12 changes: 0 additions & 12 deletions ...test_corpus/bad_ping/clusterfuzz-testcase-minimized-bad_ping_fuzzer-4826792586182656.test
View file

This file was deleted.

1 change: 0 additions & 1 deletion test/core/end2end/end2end_test_corpus/bad_ping/empty
View file

This file was deleted.

1 change: 0 additions & 1 deletion test/core/end2end/end2end_test_corpus/binary_metadata/empty
View file

This file was deleted.

Loading

0 comments on commit 8ad4013

Please sign in to comment.