diff options
author | Aleksey Filippov <alekseyf@google.com> | 2018-03-28 18:14:55 +0000 |
---|---|---|
committer | Aleksey Filippov <alekseyf@google.com> | 2018-03-28 18:34:02 +0000 |
commit | 0e8c69b7962bf668567f5aab2911ba25ded773ca (patch) | |
tree | cfd1f7c48f5c21c62fa75252444835f926d96902 | |
parent | 9596fd6c24f5cf2d4836b53e7c3033b68835d71e (diff) | |
download | meson-0e8c69b7962bf668567f5aab2911ba25ded773ca.zip meson-0e8c69b7962bf668567f5aab2911ba25ded773ca.tar.gz meson-0e8c69b7962bf668567f5aab2911ba25ded773ca.tar.bz2 |
Split SingleTestRunner._get_cmd() out of run()
-rw-r--r-- | mesonbuild/mtest.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index cf800d1..d0b8d22 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -200,22 +200,24 @@ class SingleTestRunner: self.env = env self.options = options - def run(self): + def _get_cmd(self): 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]): - cmd = ['mono'] + self.test.fname + return ['mono'] + self.test.fname else: if self.test.is_cross_built: if self.test.exe_runner is None: # Can not run test on cross compiled executable # because there is no execute wrapper. - cmd = None + return None else: - cmd = [self.test.exe_runner] + self.test.fname + return [self.test.exe_runner] + self.test.fname else: - cmd = self.test.fname + return self.test.fname + def run(self): + cmd = self._get_cmd() if cmd is None: res = TestResult.SKIP duration = 0.0 |