From 769567e7698f823fe992985b243f65f964bb88ec Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Dec 2015 15:36:52 -0800 Subject: Eliminate a layer of libraries in the end2end tests --- test/core/end2end/gen_build_yaml.py | 39 ++++++------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) (limited to 'test') diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py index abb50399b3..6a4038da73 100755 --- a/test/core/end2end/gen_build_yaml.py +++ b/test/core/end2end/gen_build_yaml.py @@ -163,33 +163,6 @@ def main(): json = { '#': 'generated with test/end2end/gen_build_json.py', 'libs': [ - { - 'name': 'end2end_fixture_%s' % f, - 'build': 'private', - 'language': 'c', - 'secure': 'check' if END2END_FIXTURES[f].secure else False, - 'src': ['test/core/end2end/fixtures/%s.c' % f], - 'platforms': ['linux', 'mac', 'posix'] if f.endswith('_posix') - else END2END_FIXTURES[f].platforms, - 'deps': sec_deps, - 'headers': ['test/core/end2end/end2end_tests.h'], - 'vs_proj_dir': 'test/end2end/fixtures/%s' % f, - } for f in sorted(END2END_FIXTURES.keys()) - ] + [ - { - 'name': 'end2end_nosec_fixture_%s' % f, - 'build': 'private', - 'language': 'c', - 'secure': False, - 'src': ['test/core/end2end/fixtures/%s.c' % f], - 'platforms': ['linux', 'mac', 'posix'] if f.endswith('_posix') - else END2END_FIXTURES[f].platforms, - 'deps': unsec_deps, - 'headers': ['test/core/end2end/end2end_tests.h'], - 'vs_proj_dir': 'test/end2end/fixtures/%s' % f, - } for f in sorted(END2END_FIXTURES.keys()) - if not END2END_FIXTURES[f].secure - ] + [ { 'name': 'end2end_tests', 'build': 'private', @@ -237,15 +210,15 @@ def main(): 'build': 'test', 'language': 'c', 'run': False, - 'src': [], + 'src': ['test/core/end2end/fixtures/%s.c' % f], 'platforms': END2END_FIXTURES[f].platforms, 'ci_platforms': (END2END_FIXTURES[f].platforms if END2END_FIXTURES[f].ci_mac else without( END2END_FIXTURES[f].platforms, 'mac')), 'deps': [ - 'end2end_fixture_%s' % f, 'end2end_tests' + 'end2end_tests' ] + sec_deps, - 'vs_proj_dir': 'test/end2end/tests', + 'vs_proj_dir': 'test/end2end/fixtures', } for f in sorted(END2END_FIXTURES.keys()) ] + [ @@ -254,16 +227,16 @@ def main(): 'build': 'test', 'language': 'c', 'secure': 'no', - 'src': [], + 'src': ['test/core/end2end/fixtures/%s.c' % f], 'run': False, 'platforms': END2END_FIXTURES[f].platforms, 'ci_platforms': (END2END_FIXTURES[f].platforms if END2END_FIXTURES[f].ci_mac else without( END2END_FIXTURES[f].platforms, 'mac')), 'deps': [ - 'end2end_nosec_fixture_%s' % f, 'end2end_nosec_tests' + 'end2end_nosec_tests' ] + unsec_deps, - 'vs_proj_dir': 'test/end2end/tests', + 'vs_proj_dir': 'test/end2end/fixtures', } for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure -- cgit v1.2.3