diff options
| author |  Mark D. Roth <roth@google.com> | 2017-04-05 10:31:36 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-04-05 10:31:36 -0700 |
| commit | 194513e388b3eedb5bbaa2b5dbcaa8509467752f (patch) | |
| tree | f2d07a0dea34f5c2625350d774c20afd67353e5a /src | |
| parent | 61a6398675ae3afd3ee305a4bba3c6c148939a05 (diff) | |
| parent | f03a078e12d9b569660ee76415003e3f87818a25 (diff) | |
Merge remote-tracking branch 'upstream/master' into filter_call_init_fail_fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpp/common/core_codegen.cc | 2 | ||||
| -rwxr-xr-x | src/objective-c/tests/run_tests.sh | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/cpp/common/core_codegen.cc b/src/cpp/common/core_codegen.cc index 36e4c89354..43dffe7a2a 100644 --- a/src/cpp/common/core_codegen.cc +++ b/src/cpp/common/core_codegen.cc @@ -111,6 +111,8 @@ grpc_byte_buffer* CoreCodegen::grpc_raw_byte_buffer_create(grpc_slice* slice, return ::grpc_raw_byte_buffer_create(slice, nslices); } +grpc_slice CoreCodegen::grpc_empty_slice() { return ::grpc_empty_slice(); } + grpc_slice CoreCodegen::grpc_slice_malloc(size_t length) { return ::grpc_slice_malloc(length); } diff --git a/src/objective-c/tests/run_tests.sh b/src/objective-c/tests/run_tests.sh index bd7c2945a2..0e82bcaa44 100755 --- a/src/objective-c/tests/run_tests.sh +++ b/src/objective-c/tests/run_tests.sh @@ -68,12 +68,16 @@ xcodebuild \ -destination name="iPhone 6" \ test | xcpretty -echo "TIME: $(date)" -xcodebuild \ - -workspace Tests.xcworkspace \ - -scheme CronetUnitTests \ - -destination name="iPhone 6" \ - test | xcpretty +# Temporarily disabled for (possible) flakiness on Jenkins. +# Fix or reenable after confirmation/disconfirmation that it is the source of +# Jenkins problem. + +# echo "TIME: $(date)" +# xcodebuild \ +# -workspace Tests.xcworkspace \ +# -scheme CronetUnitTests \ +# -destination name="iPhone 6" \ +# test | xcpretty echo "TIME: $(date)" xcodebuild \ |