Merge branch 'master' into fix-end2end-test

pull/11936/head
Sree Kuchibhotla 8 years ago
commit a7cfb12d91
  1. 5
      gRPC-Core.podspec
  2. 5
      templates/gRPC-Core.podspec.template
  3. 2
      third_party/protobuf
  4. 13
      tools/flakes/detect_flakes.py
  5. 2
      tools/run_tests/sanity/check_submodules.sh

@ -994,4 +994,9 @@ Pod::Spec.new do |s|
'test/core/util/port.c',
'test/core/util/port_server_client.{c,h}'
end
# TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
s.prepare_command = <<-END_OF_COMMAND
find src/core/ -type f -exec sed -E -i '.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
END_OF_COMMAND
end

@ -178,4 +178,9 @@
'test/core/util/port.c',
'test/core/util/port_server_client.{c,h}'
end
# TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
s.prepare_command = <<-END_OF_COMMAND
find src/core/ -type f -exec sed -E -i '.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
END_OF_COMMAND
end

@ -1 +1 @@
Subproject commit eaeca0d42b1fc4a8023a7f90d889631eda9360a3
Subproject commit 80a37e0782d2d702d52234b62dd4b9ec74fd2c95

@ -68,10 +68,13 @@ ORDER BY timestamp desc
query_job = big_query_utils.sync_query_job(bq, 'grpc-testing', query)
page = bq.jobs().getQueryResults(
pageToken=None, **query_job['jobReference']).execute(num_retries=3)
testname_to_cols = {row['f'][0]['v']:
(row['f'][1]['v'], row['f'][2]['v'], row['f'][3]['v'])
for row in page['rows']}
return testname_to_cols
rows = page.get('rows')
if rows:
return {row['f'][0]['v']:
(row['f'][1]['v'], row['f'][2]['v'], row['f'][3]['v'])
for row in rows}
else:
return {}
def get_new_flakes():
@ -91,6 +94,8 @@ def main():
if new_flakes:
print("Found {} new flakes:".format(len(new_flakes)))
print_table(new_flakes)
else:
print("No new flakes found!")
if __name__ == '__main__':

@ -31,7 +31,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7)
30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0)
ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)
eaeca0d42b1fc4a8023a7f90d889631eda9360a3 third_party/protobuf (v3.4.0rc3)
80a37e0782d2d702d52234b62dd4b9ec74fd2c95 third_party/protobuf (v3.4.0)
cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11)
7691f773af79bf75a62d1863fd0f13ebf9dc51b1 third_party/cares/cares (1.12.0)
EOF

Loading…
Cancel
Save