Skip to content

Commit

Permalink
Merge github.com:grpc/grpc into rtf
Browse files Browse the repository at this point in the history
  • Loading branch information
ctiller committed Jan 28, 2025
2 parents ada5b57 + 83e7e0b commit ad89830
Show file tree
Hide file tree
Showing 358 changed files with 30 additions and 390 deletions.
2 changes: 2 additions & 0 deletions test/core/telemetry/metrics_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,8 @@ TEST_F(MetricsDeathTest, RegisterTheSameMetricNameWouldCrash) {
int main(int argc, char** argv) {
grpc::testing::TestEnvironment env(&argc, argv);
::testing::InitGoogleTest(&argc, argv);
grpc_core::GlobalInstrumentsRegistryTestPeer::
ResetGlobalInstrumentsRegistry();
int ret = RUN_ALL_TESTS();
return ret;
}
2 changes: 0 additions & 2 deletions test/core/test_util/fake_stats_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,6 @@ class FakeStatsPlugin : public StatsPlugin {
descriptor) {
if (!use_disabled_by_default_metrics &&
!descriptor.enable_by_default) {
VLOG(2) << "FakeStatsPlugin[" << this
<< "]: skipping disabled metric: " << descriptor.name;
return;
}
switch (descriptor.instrument_type) {
Expand Down
1 change: 1 addition & 0 deletions test/core/test_util/grpc_fuzzer.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ def grpc_fuzz_test(name, srcs = [], deps = [], tags = [], data = [], external_de
"bazel_only",
],
deps = deps,
uses_polling = False,
data = data,
external_deps = external_deps,
)
16 changes: 10 additions & 6 deletions test/core/util/json/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,21 @@
# limitations under the License.

load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package")
load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzzer")
load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzz_test")

grpc_package(name = "test/core/util/json")

licenses(["notice"])

grpc_fuzzer(
name = "json_fuzzer",
srcs = ["fuzzer.cc"],
corpus = "corpus",
external_deps = ["absl/log:check"],
grpc_fuzz_test(
name = "json_fuzz_test",
srcs = ["json_fuzz_test.cc"],
external_deps = [
"absl/log:check",
"gtest",
"fuzztest",
"fuzztest_main",
],
tags = ["no_windows"],
deps = [
"//:gpr",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit ad89830

Please sign in to comment.