2018-04-26 10:56:00 +02:00
|
|
|
--- a/run_project_tests.py
|
|
|
|
+++ b/run_project_tests.py
|
|
|
|
@@ -80,7 +80,7 @@ no_meson_log_msg = 'No meson-log.txt fou
|
2017-10-19 17:35:14 +02:00
|
|
|
|
|
|
|
system_compiler = None
|
2017-06-23 22:29:28 +02:00
|
|
|
|
|
|
|
-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):
|
2018-04-26 10:56:00 +02:00
|
|
|
--- a/run_unittests.py
|
|
|
|
+++ b/run_unittests.py
|
|
|
|
@@ -506,7 +506,7 @@ class BasePlatformTests(unittest.TestCas
|
2017-08-15 18:57:45 +02:00
|
|
|
# Get the backend
|
|
|
|
# FIXME: Extract this from argv?
|
|
|
|
self.backend = getattr(Backend, os.environ.get('MESON_UNIT_TEST_BACKEND', 'ninja'))
|
2018-02-06 10:16:50 +01:00
|
|
|
- self.meson_mainfile = os.path.join(src_root, 'meson.py')
|
|
|
|
+ self.meson_mainfile = '/usr/bin/meson'
|
|
|
|
self.meson_args = ['--backend=' + self.backend.name]
|
2018-04-26 10:56:00 +02:00
|
|
|
self.meson_cross_file = None
|
2018-02-06 10:16:50 +01:00
|
|
|
self.meson_command = meson_command + self.meson_args
|