fixup! Introduce precooked project

[deliverable/lttng-ivc.git] / lttng_ivc / utils / project.py

diff --git a/lttng_ivc/utils/project.py b/lttng_ivc/utils/project.py
index bd389a59b4fb6b7257f63757b6074390fc098dad..073acb19cc0c2ea7510c79abe783175613b60735 100644 (file)
--- a/lttng_ivc/utils/project.py
+++ b/lttng_ivc/utils/project.py
@@ -6,7 +6,7 @@ import logging
 import lttng_ivc.settings as Settings
 
 from lttng_ivc.utils.utils import sha256_checksum
-from lttng_ivc.utils.utils import find_dir
+from lttng_ivc.utils.utils import find_dir, find_file
 
 _logger = logging.getLogger('project')
 
@@ -308,6 +308,12 @@ class Lttng_modules(Project):
         p.check_returncode()
         self.isInstalled = True
 
+    def autobuild(self):
+        try:
+            super(Lttng_modules, self).autobuild()
+        except subprocess.CalledProcessError as e:
+            self.skip = True
+
 
 class Lttng_ust(Project):
     def __init__(self, label, git_path, sha1, tmpdir):
@@ -339,6 +345,15 @@ class Lttng_tools(Project):
         self.add_special_env_variable("LTTNG_SESSION_CONFIG_XSD_PATH",
                 os.path.join(self.installation_path, "share/xml/lttng/"))
 
+        # Find the mi xsd
+        for xsd in Settings.mi_xsd_file_name:
+            mi = find_file(self.source_path, xsd)
+            if mi:
+                break
+        if not mi:
+            raise Exception("MI xsd not found")
+        self.mi_xsd = mi
+
 
 class Babeltrace(Project):
     pass