forked from pool/meson
511b7124fa
Rebased submission with the test suite split out into a 2nd spec file OBS-URL: https://build.opensuse.org/request/show/505966 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=48
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
Index: meson-0.41.0/run_unittests.py
|
|
===================================================================
|
|
--- meson-0.41.0.orig/run_unittests.py
|
|
+++ meson-0.41.0/run_unittests.py
|
|
@@ -414,7 +414,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_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, 'mesonconf.py')]
|
|
self.mintro_command = [sys.executable, os.path.join(src_root, 'mesonintrospect.py')]
|
|
Index: meson-0.41.0/run_project_tests.py
|
|
===================================================================
|
|
--- meson-0.41.0.orig/run_project_tests.py
|
|
+++ meson-0.41.0/run_project_tests.py
|
|
@@ -125,7 +125,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):
|