forked from pool/meson
3a5d359b36
Update to 0.44.0 OBS-URL: https://build.opensuse.org/request/show/573229 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=72
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
Index: meson-0.44.0/run_project_tests.py
|
|
===================================================================
|
|
--- meson-0.44.0.orig/run_project_tests.py
|
|
+++ meson-0.44.0/run_project_tests.py
|
|
@@ -126,7 +126,7 @@ no_meson_log_msg = 'No meson-log.txt fou
|
|
|
|
system_compiler = None
|
|
|
|
-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.44.0/run_unittests.py
|
|
===================================================================
|
|
--- meson-0.44.0.orig/run_unittests.py
|
|
+++ meson-0.44.0/run_unittests.py
|
|
@@ -462,7 +462,7 @@ 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_mainfile = os.path.join(src_root, 'meson.py')
|
|
+ self.meson_mainfile = '/usr/bin/meson'
|
|
self.meson_args = ['--backend=' + self.backend.name]
|
|
self.meson_command = meson_command + self.meson_args
|
|
self.mconf_command = meson_command + ['configure']
|