Split SingleTestRunner._get_cmd() out of run()

pull/3322/head
Aleksey Filippov 7 years ago
parent 9596fd6c24
commit 0e8c69b796
  1. 14
      mesonbuild/mtest.py

@ -200,22 +200,24 @@ class SingleTestRunner:
self.env = env self.env = env
self.options = options self.options = options
def run(self): def _get_cmd(self):
if self.test.fname[0].endswith('.jar'): if self.test.fname[0].endswith('.jar'):
cmd = ['java', '-jar'] + self.test.fname return ['java', '-jar'] + self.test.fname
elif not self.test.is_cross_built and run_with_mono(self.test.fname[0]): elif not self.test.is_cross_built and run_with_mono(self.test.fname[0]):
cmd = ['mono'] + self.test.fname return ['mono'] + self.test.fname
else: else:
if self.test.is_cross_built: if self.test.is_cross_built:
if self.test.exe_runner is None: if self.test.exe_runner is None:
# Can not run test on cross compiled executable # Can not run test on cross compiled executable
# because there is no execute wrapper. # because there is no execute wrapper.
cmd = None return None
else: else:
cmd = [self.test.exe_runner] + self.test.fname return [self.test.exe_runner] + self.test.fname
else: else:
cmd = self.test.fname return self.test.fname
def run(self):
cmd = self._get_cmd()
if cmd is None: if cmd is None:
res = TestResult.SKIP res = TestResult.SKIP
duration = 0.0 duration = 0.0

Loading…
Cancel
Save