forked from pool/meson
Dominique Leuenberger
147e47a322
- Update to version 0.54.0: OBS-URL: https://build.opensuse.org/request/show/790166 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=163
45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
Index: meson-0.54.0/run_tests.py
|
|
===================================================================
|
|
--- meson-0.54.0.orig/run_tests.py
|
|
+++ meson-0.54.0/run_tests.py
|
|
@@ -152,18 +152,10 @@ def get_meson_script():
|
|
Also used by run_unittests.py to determine what meson to run when not
|
|
running in-process (which is the default).
|
|
'''
|
|
- # Is there a meson.py next to the mesonbuild currently in use?
|
|
- mesonbuild_dir = Path(mesonmain.__file__).resolve().parent.parent
|
|
- meson_script = mesonbuild_dir / 'meson.py'
|
|
- if meson_script.is_file():
|
|
- return str(meson_script)
|
|
- # Then if mesonbuild is in PYTHONPATH, meson must be in PATH
|
|
- mlog.warning('Could not find meson.py next to the mesonbuild module. '
|
|
- 'Trying system meson...')
|
|
meson_cmd = shutil.which('meson')
|
|
- if meson_cmd:
|
|
+ if meson_cmd and os.path.isfile(meson_cmd):
|
|
return meson_cmd
|
|
- raise RuntimeError('Could not find {!r} or a meson in PATH'.format(meson_script))
|
|
+ raise RuntimeError('Could not find a meson in PATH')
|
|
|
|
def get_backend_args_for_dir(backend, builddir):
|
|
'''
|
|
@@ -366,12 +358,12 @@ def main():
|
|
else:
|
|
env['PYTHONPATH'] = temp_dir
|
|
if not cross:
|
|
- cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v']
|
|
- if options.failfast:
|
|
- cmd += ['--failfast']
|
|
- returncode += subprocess.call(cmd, env=env)
|
|
- if options.failfast and returncode != 0:
|
|
- return returncode
|
|
+ #cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v']
|
|
+ #if options.failfast:
|
|
+ # cmd += ['--failfast']
|
|
+ #returncode += subprocess.call(cmd, env=env)
|
|
+ #if options.failfast and returncode != 0:
|
|
+ # return returncode
|
|
if no_unittests:
|
|
print('Skipping all unit tests.')
|
|
print(flush=True)
|