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 | |
| 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.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
3 files changed, 5 insertions, 5 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'] diff --git a/run_unittests.py b/run_unittests.py index 1f24847..06b3f4c 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -419,7 +419,7 @@ class BasePlatformTests(unittest.TestCase): self.meson_command = [sys.executable] + self.meson_args self.mconf_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'configure'] self.mintro_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'introspect'] - self.mtest_command = [sys.executable, os.path.join(src_root, 'mesontest.py'), '-C', self.builddir] + self.mtest_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'test', '-C', self.builddir] # Backend-specific build commands self.build_command, self.clean_command, self.test_command, self.install_command, \ self.uninstall_command = get_backend_commands(self.backend) |