File meson-test-installed-bin.patch of Package meson

Overview Repositories Revisions Requests Users Attributes Meta

File meson-test-installed-bin.patch of Package meson (Revision a0c302467364d0d2ae7a6dd886baeaae)

Currently displaying revision a0c302467364d0d2ae7a6dd886baeaae , Show latest

Index: meson-0.58.0/run_tests.py
===================================================================
--- meson-0.58.0.orig/run_tests.py
+++ meson-0.58.0/run_tests.py
@@ -158,18 +158,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(f'Could not find {meson_script!r} or a meson in PATH')
+    raise RuntimeError(f'Could not find meson in PATH')
 
 def get_backend_args_for_dir(backend, builddir):
     '''
@@ -359,12 +351,12 @@ def main():
             else:
                 env['PYTHONPATH'] = temp_dir
         if not options.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)

Places

File meson-test-installed-bin.patch of Package meson (Revision a0c302467364d0d2ae7a6dd886baeaae)

Places