diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-08-25 17:02:09 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-08-25 17:02:09 -0700 |
| commit | 9a26584be9d0fcdd7f75f4a38aa942630e9659b5 (patch) | |
| tree | 26dd27113b03a445083428af16c04a807a3a2b7f /tools/run_tests | |
| parent | 6e869449051b157f70681ea8506f05f9b7d12581 (diff) | |
| parent | e69426448a5b84ea05fd64f86728b85bee84118e (diff) | |
Merge pull request #3068 from ctiller/make-might-take-a-very-long-time
Windows builds need longer
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index beb43438e5..beb8805ff9 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -465,7 +465,8 @@ if len(build_configs) > 1: if platform.system() == 'Windows': def make_jobspec(cfg, targets): return jobset.JobSpec(['make.bat', 'CONFIG=%s' % cfg] + targets, - cwd='vsprojects', shell=True) + cwd='vsprojects', shell=True, + timeout_seconds=30*60) else: def make_jobspec(cfg, targets): return jobset.JobSpec([os.getenv('MAKE', 'make'), |