diff options
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index a0fd90a..6b0c533 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -817,8 +817,7 @@ int dummy; def generate_tests(self, outfile): self.serialize_tests() - test_exe = get_meson_script(self.environment, 'mesontest') - cmd = [sys.executable, '-u', test_exe, '--no-rebuild'] + cmd = [sys.executable, '-u', self.environment.get_build_command(), 'test', '--no-rebuild'] if not self.environment.coredata.get_builtin_option('stdsplit'): cmd += ['--no-stdsplit'] if self.environment.coredata.get_builtin_option('errorlogs'): @@ -830,7 +829,7 @@ int dummy; elem.write(outfile) # And then benchmarks. - cmd = [sys.executable, '-u', test_exe, '--benchmark', '--logbase', + cmd = [sys.executable, '-u', self.environment.get_build_command(), 'test', '--benchmark', '--logbase', 'benchmarklog', '--num-processes=1', '--no-rebuild'] elem = NinjaBuildElement(self.all_outputs, 'benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem.add_item('COMMAND', cmd) diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 28c0f76..4832f7e 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1177,7 +1177,8 @@ if %%errorlevel%% neq 0 goto :VCEnd''' ET.SubElement(postbuild, 'Message') # FIXME: No benchmarks? test_command = [sys.executable, - get_meson_script(self.environment, 'mesontest'), + self.environment.get_build_command(), + 'test', '--no-rebuild'] if not self.environment.coredata.get_builtin_option('stdsplit'): test_command += ['--no-stdsplit'] |