diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-04-21 13:57:55 -0700 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-21 13:57:55 -0700 |
commit | 062db022b767177b76fe2cdc221244594f29e473 (patch) | |
tree | 818770624f004c57189681facdb114e44e0ed4a3 /test | |
parent | d2b11fafdc533ae7547ca69a9dbd536c35da98c1 (diff) | |
parent | 3cdb3b627e4d43806567c6591b5691cd1b6d36d2 (diff) |
Merge github.com:google/grpc into batch-metadata
Conflicts:
Makefile
vsprojects/Grpc.mak
vsprojects/vs2010/Grpc.mak
vsprojects/vs2010/grpc.vcxproj
vsprojects/vs2010/grpc.vcxproj.filters
vsprojects/vs2010/grpc_test_util.vcxproj
vsprojects/vs2010/grpc_unsecure.vcxproj
vsprojects/vs2010/grpc_unsecure.vcxproj.filters
Diffstat (limited to 'test')
-rwxr-xr-x | test/core/end2end/gen_build_json.py | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_json.py index 2cb61f9d8d..51026a81e5 100755 --- a/test/core/end2end/gen_build_json.py +++ b/test/core/end2end/gen_build_json.py @@ -34,15 +34,17 @@ import simplejson -END2END_FIXTURES = [ - 'chttp2_fake_security', - 'chttp2_fullstack', - 'chttp2_fullstack_uds', - 'chttp2_simple_ssl_fullstack', - 'chttp2_simple_ssl_with_oauth2_fullstack', - 'chttp2_socket_pair', - 'chttp2_socket_pair_one_byte_at_a_time', -] + +# maps fixture name to whether it requires the security library +END2END_FIXTURES = { + 'chttp2_fake_security': True, + 'chttp2_fullstack': False, + 'chttp2_fullstack_uds': False, + 'chttp2_simple_ssl_fullstack': True, + 'chttp2_simple_ssl_with_oauth2_fullstack': True, + 'chttp2_socket_pair': False, + 'chttp2_socket_pair_one_byte_at_a_time': False, +} END2END_TESTS = [ @@ -111,7 +113,7 @@ def main(): 'secure': 'check', 'src': ['test/core/end2end/fixtures/%s.c' % f] } - for f in END2END_FIXTURES] + [ + for f in sorted(END2END_FIXTURES.keys())] + [ { 'name': 'end2end_test_%s' % t, 'build': 'private', @@ -120,7 +122,7 @@ def main(): 'src': ['test/core/end2end/tests/%s.c' % t], 'headers': ['test/core/end2end/tests/cancel_test_helpers.h'] } - for t in END2END_TESTS] + [ + for t in sorted(END2END_TESTS)] + [ { 'name': 'end2end_certs', 'build': 'private', @@ -149,8 +151,24 @@ def main(): 'gpr' ] } - for f in END2END_FIXTURES - for t in END2END_TESTS]} + for f in sorted(END2END_FIXTURES.keys()) + for t in sorted(END2END_TESTS)] + [ + { + 'name': '%s_%s_unsecure_test' % (f, t), + 'build': 'test', + 'language': 'c', + 'src': [], + 'deps': [ + 'end2end_fixture_%s' % f, + 'end2end_test_%s' % t, + 'grpc_test_util', + 'grpc_unsecure', + 'gpr_test_util', + 'gpr' + ] + } + for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f] + for t in sorted(END2END_TESTS)]} print simplejson.dumps(json, sort_keys=True, indent=2 * ' ') |