aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 5ca569b..8f64db9 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -711,7 +711,10 @@ int dummy;
def generate_tests(self, outfile):
(test_data, benchmark_data) = self.serialise_tests()
- cmd = [ sys.executable, self.environment.get_build_command(), '--internal', 'test' ]
+ meson_exe = self.environment.get_build_command()
+ (base, ext) = os.path.splitext(meson_exe)
+ test_exe = base + 'test' + ext
+ cmd = [sys.executable, test_exe]
if not self.environment.coredata.get_builtin_option('stdsplit'):
cmd += ['--no-stdsplit']
if self.environment.coredata.get_builtin_option('errorlogs'):
@@ -724,7 +727,8 @@ int dummy;
elem.write(outfile)
# And then benchmarks.
- cmd = [sys.executable, self.environment.get_build_command(), '--internal', 'benchmark', benchmark_data]
+ cmd = [sys.executable, test_exe, '--benchmark','--logbase',
+ 'benchmarklog', '--num-processes=1', benchmark_data]
elem = NinjaBuildElement(self.all_outputs, 'benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY'])
elem.add_item('COMMAND', cmd)
elem.add_item('DESC', 'Running benchmark suite.')