diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-14 01:10:19 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-14 15:54:57 +0300 |
commit | 5c8328d27f5a830b604dc8635815eee916a51971 (patch) | |
tree | bdc27f894a3fb0a8ba2c02c84357856efd481753 /mesonbuild/backend/ninjabackend.py | |
parent | 55165ba504ce107c0636986087ba1139308d6fcb (diff) | |
download | meson-5c8328d27f5a830b604dc8635815eee916a51971.zip meson-5c8328d27f5a830b604dc8635815eee916a51971.tar.gz meson-5c8328d27f5a830b604dc8635815eee916a51971.tar.bz2 |
Use "meson test" in test invocations so it will not print the deprecation warning.
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 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) |