Index: meson-0.42.0/run_project_tests.py =================================================================== --- meson-0.42.0.orig/run_project_tests.py +++ meson-0.42.0/run_project_tests.py @@ -124,7 +124,7 @@ print_debug = 'MESON_PRINT_TEST_OUTPUT' do_debug = not {'MESON_PRINT_TEST_OUTPUT', 'TRAVIS', 'APPVEYOR'}.isdisjoint(os.environ) no_meson_log_msg = 'No meson-log.txt found.' -meson_command = os.path.join(os.getcwd(), 'meson') +meson_command = '/usr/bin/meson' if not os.path.exists(meson_command): meson_command += '.py' if not os.path.exists(meson_command): Index: meson-0.42.0/run_unittests.py =================================================================== --- meson-0.42.0.orig/run_unittests.py +++ meson-0.42.0/run_unittests.py @@ -416,11 +416,11 @@ class BasePlatformTests(unittest.TestCas # Get the backend # FIXME: Extract this from argv? 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_args = ['/usr/bin/meson', '--backend=' + self.backend.name] 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, 'meson.py'), 'test', '-C', self.builddir] + self.mconf_command = [sys.executable, '/usr/bin/meson', 'configure'] + self.mintro_command = [sys.executable, '/usr/bin/meson', 'introspect'] + self.mtest_command = [sys.executable, '/usr/bin/meson', '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)