Merge branch 'master' of github.com:grpc/grpc into decompression

# Conflicts:
#	Makefile
#	gRPC.podspec
#	src/core/surface/call.c
#	src/core/transport/chttp2/frame_data.c
#	tools/doxygen/Doxyfile.core.internal
#	vsprojects/Grpc.mak

1 files changed, 20 insertions, 14 deletions

diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_json.py
index e6b0e57657..8b0dd3166b 100755
--- a/test/core/end2end/gen_build_json.py
+++ b/test/core/end2end/gen_build_json.py
@@ -95,6 +95,19 @@ END2END_TESTS = {
 
 
 def main():
+  sec_deps = [
+    'end2end_certs',
+    'grpc_test_util',
+    'grpc',
+    'gpr_test_util',
+    'gpr'
+  ]
+  unsec_deps = [
+    'grpc_test_util_unsecure',
+    'grpc_unsecure',
+    'gpr_test_util',
+    'gpr'
+  ]
   json = {
       '#': 'generated with test/end2end/gen_build_json.py',
       'libs': [
@@ -105,6 +118,8 @@ def main():
               'secure': 'check' if END2END_FIXTURES[f].secure else 'no',
               'src': ['test/core/end2end/fixtures/%s.c' % f],
               'platforms': [ 'posix' ] if f.endswith('_posix') else END2END_FIXTURES[f].platforms,
+              'deps': sec_deps if END2END_FIXTURES[f].secure else unsec_deps,
+              'headers': ['test/core/end2end/end2end_tests.h'],
           }
           for f in sorted(END2END_FIXTURES.keys())] + [
           {
@@ -113,7 +128,9 @@ def main():
               'language': 'c',
               'secure': 'check' if END2END_TESTS[t].secure else 'no',
               'src': ['test/core/end2end/tests/%s.c' % t],
-              'headers': ['test/core/end2end/tests/cancel_test_helpers.h']
+              'headers': ['test/core/end2end/tests/cancel_test_helpers.h',
+                          'test/core/end2end/end2end_tests.h'],
+              'deps': sec_deps if END2END_TESTS[t].secure else unsec_deps
           }
           for t in sorted(END2END_TESTS.keys())] + [
           {
@@ -137,13 +154,7 @@ def main():
               'platforms': END2END_FIXTURES[f].platforms,
               'deps': [
                   'end2end_fixture_%s' % f,
-                  'end2end_test_%s' % t,
-                  'end2end_certs',
-                  'grpc_test_util',
-                  'grpc',
-                  'gpr_test_util',
-                  'gpr'
-              ]
+                  'end2end_test_%s' % t] + sec_deps
           }
       for f in sorted(END2END_FIXTURES.keys())
       for t in sorted(END2END_TESTS.keys())] + [
@@ -157,12 +168,7 @@ def main():
               'platforms': END2END_FIXTURES[f].platforms,
               'deps': [
                   'end2end_fixture_%s' % f,
-                  'end2end_test_%s' % t,
-                  'grpc_test_util_unsecure',
-                  'grpc_unsecure',
-                  'gpr_test_util',
-                  'gpr'
-              ]
+                  'end2end_test_%s' % t] + unsec_deps
           }
       for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure
       for t in sorted(END2END_TESTS.keys()) if not END2END_TESTS[t].secure]}