Prevent run_tests.py from running make if the language has no make targets

pull/3970/head
murgatroid99 9 years ago
parent c0f656a54a
commit 8ae409f574
  1. 3
      tools/run_tests/run_tests.py

@ -637,6 +637,7 @@ if platform.system() == 'Windows':
for target in targets] for target in targets]
else: else:
def make_jobspec(cfg, targets, makefile='Makefile'): def make_jobspec(cfg, targets, makefile='Makefile'):
if targets:
return [jobset.JobSpec([os.getenv('MAKE', 'make'), return [jobset.JobSpec([os.getenv('MAKE', 'make'),
'-f', makefile, '-f', makefile,
'-j', '%d' % (multiprocessing.cpu_count() + 1), '-j', '%d' % (multiprocessing.cpu_count() + 1),
@ -644,6 +645,8 @@ else:
args.slowdown, args.slowdown,
'CONFIG=%s' % cfg] + targets, 'CONFIG=%s' % cfg] + targets,
timeout_seconds=30*60)] timeout_seconds=30*60)]
else:
return []
make_targets = {} make_targets = {}
for l in languages: for l in languages:
makefile = l.makefile_name() makefile = l.makefile_name()

Loading…
Cancel
Save