diff options
author | 2016-06-30 15:37:11 -0700 | |
---|---|---|
committer | 2016-06-30 15:37:11 -0700 | |
commit | c93d6a66a12110f82882807d95ad5dcb02370151 (patch) | |
tree | efb5e632e8ad237e05d63af14e54c2a8d83ad87b /test/core/nanopb | |
parent | 095172c3a52a11c42aed0150eb8dbb47186fd2a0 (diff) | |
parent | a5596db1a53723789d7c90c23d9cbfbb8207f949 (diff) |
Merge master into merge-0.14-into-master
Conflicts:
- gRPC.podspec
- Only had non-trivial changes in the core file list, which will need to be
regenerated (in gRPC-Core.podspec).
- src/objective-c/BoringSSL.podspec
- Had trivial conflicts in the version.
- src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
- Trivial conflicts in quoting.
- src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and
src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj
- The master version is used, pending testing. The 0.14 version had emoji and
some unneeded entries.
- src/objective-c/tests/Podfile
- Added CronetFramework pod, and warning silencing from master.
- templates/gRPC.podspec.template
- Deleted.
- third_party/protobuf
- Using master commit, but need to verify if it works for frameworks.
Diffstat (limited to 'test/core/nanopb')
-rw-r--r-- | test/core/nanopb/fuzzer_response.c | 3 | ||||
-rw-r--r-- | test/core/nanopb/fuzzer_serverlist.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/test/core/nanopb/fuzzer_response.c b/test/core/nanopb/fuzzer_response.c index b4e386020a..21a5d7b968 100644 --- a/test/core/nanopb/fuzzer_response.c +++ b/test/core/nanopb/fuzzer_response.c @@ -38,6 +38,9 @@ #include "src/core/ext/lb_policy/grpclb/load_balancer_api.h" +bool squelch = true; +bool leak_check = true; + int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { gpr_slice slice = gpr_slice_from_copied_buffer((const char *)data, size); grpc_grpclb_response *response; diff --git a/test/core/nanopb/fuzzer_serverlist.c b/test/core/nanopb/fuzzer_serverlist.c index d4ec74f0e7..df2044d907 100644 --- a/test/core/nanopb/fuzzer_serverlist.c +++ b/test/core/nanopb/fuzzer_serverlist.c @@ -38,6 +38,9 @@ #include "src/core/ext/lb_policy/grpclb/load_balancer_api.h" +bool squelch = true; +bool leak_check = true; + int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { gpr_slice slice = gpr_slice_from_copied_buffer((const char *)data, size); grpc_grpclb_serverlist *serverlist; |