diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2016-01-25 18:21:14 -0800 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2016-01-27 07:29:27 -0800 |
commit | fba6530a6a66f524be0ed34cf05acc73b6738a85 (patch) | |
tree | a59ea4edd7061d03a2528237a447095d4db19a11 /tools | |
parent | 9be594f76b6152c0926d7a8129cc75ce4c6478cb (diff) |
refactor make_jobspec
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run_tests/run_tests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 7d3a638cdb..767b801c2a 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -774,8 +774,8 @@ if args.use_docker: env=env) sys.exit(0) -if platform_string() == 'windows': - def make_jobspec(cfg, targets, makefile='Makefile'): +def make_jobspec(cfg, targets, makefile='Makefile'): + if platform_string() == 'windows': extra_args = [] # better do parallel compilation # empirically /m:2 gives the best performance/price and should prevent @@ -793,8 +793,7 @@ if platform_string() == 'windows': language_make_options, shell=True, timeout_seconds=None) for target in targets] -else: - def make_jobspec(cfg, targets, makefile='Makefile'): + else: if targets: return [jobset.JobSpec([os.getenv('MAKE', 'make'), '-f', makefile, @@ -807,6 +806,7 @@ else: timeout_seconds=None)] else: return [] + make_targets = {} for l in languages: makefile = l.makefile_name() |