Handle test dependencies better

pull/3097/head
Craig Tiller 10 years ago
parent 456ce490ea
commit 605076a7aa
  1. 9
      templates/vsprojects/vcxproj_defs.include
  2. 4
      test/core/end2end/gen_build_yaml.py
  3. 1
      tools/run_tests/jobset.py

@ -11,6 +11,7 @@
if t.name == name:
target = t
props = project.vs_props
packages = project.vs_packages
configuration_type = project.vs_config_type
project_guid = project.vs_project_guid
if target.build == 'test' and target.language == 'c++':
@ -21,13 +22,17 @@
else:
if target.language == 'c++':
props.extend(['protobuf'])
props.extend(['winsock', 'zlib', 'openssl'])
props.extend(['winsock', 'zlib'])
packages.extend(['grpc.dependencies.zlib'])
if target.get('secure', 'check'):
props.extend(['openssl'])
packages.extend(['grpc.dependencies.openssl'])
else:
props.extend(['winsock'])
props.extend(['global'])
props = sorted(list(set(props)))
packages = sorted(list(set(packages)))
dll = project.get('dll', False)
packages = project.vs_packages
repo_root = '..\..\..' + ('\..' if project.vs_proj_dir != '.' else '')
%>\
<?xml version="1.0" encoding="utf-8"?>

@ -144,7 +144,7 @@ def main():
'name': 'end2end_fixture_%s' % f,
'build': 'private',
'language': 'c',
'secure': 'check' if END2END_FIXTURES[f].secure else 'no',
'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 if END2END_FIXTURES[f].secure else unsec_deps,
@ -156,7 +156,7 @@ def main():
'name': 'end2end_test_%s' % t,
'build': 'private',
'language': 'c',
'secure': 'check' if END2END_TESTS[t].secure else 'no',
'secure': 'check' if END2END_TESTS[t].secure else False,
'src': ['test/core/end2end/tests/%s.c' % t],
'headers': ['test/core/end2end/tests/cancel_test_helpers.h',
'test/core/end2end/end2end_tests.h'],

@ -174,7 +174,6 @@ class Job(object):
for k, v in add_env.iteritems():
env[k] = v
self._start = time.time()
print spec.cmdline
self._process = subprocess.Popen(args=spec.cmdline,
stderr=subprocess.STDOUT,
stdout=self._tempfile,

Loading…
Cancel
Save