aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-08-06 17:00:51 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-06 17:00:51 +0300
commitd94e06db21e8bcfcf194b7ba5eb8255acd168d4d (patch)
tree4ed41e9f3d21ed943b4145402f874e5449c05a85 /run_unittests.py
parent06f195e9ec1e8ea399ebb138b63865c1e3f4c90d (diff)
parente765091c2e34f5ac3cd84cf5a61c30ec0868e0a9 (diff)
downloadmeson-d94e06db21e8bcfcf194b7ba5eb8255acd168d4d.zip
meson-d94e06db21e8bcfcf194b7ba5eb8255acd168d4d.tar.gz
meson-d94e06db21e8bcfcf194b7ba5eb8255acd168d4d.tar.bz2
Merged singleexe branch.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 12b5278..5782c1d 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -416,8 +416,8 @@ class BasePlatformTests(unittest.TestCase):
self.backend = getattr(Backend, os.environ.get('MESON_UNIT_TEST_BACKEND', 'ninja'))
self.meson_args = [os.path.join(src_root, 'meson.py'), '--backend=' + self.backend.name]
self.meson_command = [sys.executable] + self.meson_args
- self.mconf_command = [sys.executable, os.path.join(src_root, 'mesonconf.py')]
- self.mintro_command = [sys.executable, os.path.join(src_root, 'mesonintrospect.py')]
+ 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]
# Backend-specific build commands
self.build_command, self.clean_command, self.test_command, self.install_command, \