gst-env: Prematurely skip all targets that aren't installed
authorNirbheek Chauhan <nirbheek@centricular.com>
Thu, 23 Jul 2020 10:35:06 +0000 (16:05 +0530)
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Mon, 3 Aug 2020 18:52:20 +0000 (18:52 +0000)
Simplifies the code a bit.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/180>

gst-env.py

index 519418e..3bbe2c9 100755 (executable)
@@ -80,8 +80,6 @@ def is_library_target_and_not_plugin(target, filename):
     '''
     if not target['type'].startswith('shared'):
         return False
-    if not target['installed']:
-        return False
     # Check if this output of that target is a shared library
     if not SHAREDLIB_REG.search(filename):
         return False
@@ -104,8 +102,6 @@ def is_library_target_and_not_plugin(target, filename):
 def is_binary_target_and_in_path(target, filename, bindir):
     if target['type'] != 'executable':
         return False
-    if not target['installed']:
-        return False
     # Check if this file installed by this target is installed to bindir
     for install_filename in listify(target['install_filename']):
         if install_filename.endswith(os.path.basename(filename)):
@@ -282,6 +278,8 @@ def get_subprocess_env(options, gst_version):
 
     for target in targets:
         filenames = listify(target['filename'])
+        if not target['installed']:
+            continue
         for filename in filenames:
             root = os.path.dirname(filename)
             if srcdir_path / "subprojects/gst-devtools/validate/plugins" in (srcdir_path / root).parents: