Merge pull request #3068 from ctiller/make-might-take-a-very-long-time

Windows builds need longer
pull/2992/merge
Jan Tattermusch 9 years ago
commit 9a26584be9
  1. 3
      tools/run_tests/run_tests.py

@ -465,7 +465,8 @@ if len(build_configs) > 1:
if platform.system() == 'Windows': if platform.system() == 'Windows':
def make_jobspec(cfg, targets): def make_jobspec(cfg, targets):
return jobset.JobSpec(['make.bat', 'CONFIG=%s' % cfg] + targets, return jobset.JobSpec(['make.bat', 'CONFIG=%s' % cfg] + targets,
cwd='vsprojects', shell=True) cwd='vsprojects', shell=True,
timeout_seconds=30*60)
else: else:
def make_jobspec(cfg, targets): def make_jobspec(cfg, targets):
return jobset.JobSpec([os.getenv('MAKE', 'make'), return jobset.JobSpec([os.getenv('MAKE', 'make'),

Loading…
Cancel
Save