diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-18 21:55:13 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-18 22:10:22 +0200 |
| commit | 1ebc5c1ea0c4f32ffd9acd82a8fc7f122326b01c (patch) | |
| tree | fd3589a10ed1d3007572ac6c499241c009d666e6 /mesonbuild/backend/ninjabackend.py | |
| parent | c7ddce163fb8f440c96649a3319ab9f1f62e38be (diff) | |
| download | meson-1ebc5c1ea0c4f32ffd9acd82a8fc7f122326b01c.zip meson-1ebc5c1ea0c4f32ffd9acd82a8fc7f122326b01c.tar.gz meson-1ebc5c1ea0c4f32ffd9acd82a8fc7f122326b01c.tar.bz2 | |
Can run special tests with the new tool.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8f64db9..00a09fc 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -710,7 +710,7 @@ int dummy; d.install_subdirs.append([src_dir, inst_dir, dst_dir]) def generate_tests(self, outfile): - (test_data, benchmark_data) = self.serialise_tests() + self.serialise_tests() meson_exe = self.environment.get_build_command() (base, ext) = os.path.splitext(meson_exe) test_exe = base + 'test' + ext @@ -719,7 +719,6 @@ int dummy; cmd += ['--no-stdsplit'] if self.environment.coredata.get_builtin_option('errorlogs'): cmd += ['--print-errorlogs'] - cmd += [ test_data ] elem = NinjaBuildElement(self.all_outputs, 'test', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem.add_item('COMMAND', cmd) elem.add_item('DESC', 'Running all tests.') @@ -728,7 +727,7 @@ int dummy; # And then benchmarks. cmd = [sys.executable, test_exe, '--benchmark','--logbase', - 'benchmarklog', '--num-processes=1', benchmark_data] + 'benchmarklog', '--num-processes=1'] elem = NinjaBuildElement(self.all_outputs, 'benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem.add_item('COMMAND', cmd) elem.add_item('DESC', 'Running benchmark suite.') |