tooling: Remove VTD dependency from cloe and cloe-plugin-vtd

Only require what you really need. It should not be required to have the
VTD distribution around if you want to start it in another container for
example.

Author: cassava

Makefile

@@ -74,7 +74,7 @@ doxygen:
 smoketest:
 	# Call this target with WITH_VTD=1 to include VTD binding tests.
 	$(call print_header, "Running smoke tests...")
-	@${CLOE_LAUNCH} clean -P conanfile.py
+	@${CLOE_LAUNCH} clean -P conantest.py
 	@\time -f "\nTotal smoketest time (real) = %e sec" bats tests
 
 purge-all:

conanfile.py

@@ -22,7 +22,7 @@ class Cloe(ConanFile):
         "with_engine": True,
     }
     generators = "cmake"
-    no_copy_source = False
+    no_copy_source = True
 
     _cmake = None
 
@@ -49,7 +49,6 @@ def requirements(self):
         ]
         if self.options.with_vtd:
             requires.append("cloe-plugin-vtd")
-            self.requires("osi-sensor/1.0.0-vtd2.2@cloe/stable")
 
         if self.options.with_engine:
             requires.append("cloe-engine")

conantest.py

@@ -0,0 +1,31 @@
+from pathlib import Path
+from conans import ConanFile, tools
+
+
+class CloeTest(ConanFile):
+    name = "cloe-test"
+    settings = "os", "compiler", "build_type", "arch"
+    options = {
+        "with_vtd": [True, False],
+    }
+    default_options = {
+        "with_vtd": False,
+    }
+    no_copy_source = True
+
+    def set_version(self):
+        version_file = Path(self.recipe_folder) / "VERSION"
+        if version_file.exists():
+            self.version = tools.load(version_file).strip()
+        else:
+            git = tools.Git(folder=self.recipe_folder)
+            self.version = git.run("describe --dirty=-dirty")[1:]
+
+    def requirements(self):
+        self.requires(f"cloe/{self.version}@cloe/develop")
+        if self.options.with_vtd:
+            self.requires("osi-sensor/1.0.0-vtd2.2@cloe/stable")
+            self.requires("vtd/2.2.0@cloe-restricted/stable")
+
+    def configure(self):
+        self.options["cloe"].with_vtd = self.options.with_vtd

plugins/vtd/conanfile.py

@@ -28,7 +28,6 @@ class CloeSimulatorVTD(ConanFile):
     requires = [
         "open-simulation-interface/3.2.0@cloe/stable",
         "vtd-api/2.2.0@cloe-restricted/stable",
-        "vtd/2.2.0@cloe-restricted/stable",
     ]
 
     _cmake = None

tests/setup_bats.bash

@@ -29,7 +29,7 @@ export exit_outcome_syskill=250
 #   CLOE_WRITE_OUTPUT   : bool
 cloe_engine() {
     local cloe_log_level="${CLOE_LOG_LEVEL-debug}"
-    local cloe_profile_file="${CLOE_PROFILE_FILE-${CLOE_ROOT}/conanfile.py}"
+    local cloe_profile_file="${CLOE_PROFILE_FILE-${CLOE_ROOT}/conantest.py}"
     local cloe_launch_exe=(python3 -m cloe_launch)
     local cloe_launch_args=(-vv exec -c -P "${cloe_profile_file}")
     local cloe_engine_args=(--no-system-confs --no-system-plugins --level ${cloe_log_level})
@@ -75,7 +75,7 @@ cloe_engine() {
 
 cloe_shell() {
     local cloe_log_level="${CLOE_LOG_LEVEL-debug}"
-    local cloe_profile_file="${CLOE_PROFILE_FILE-${CLOE_ROOT}/conanfile.py}"
+    local cloe_profile_file="${CLOE_PROFILE_FILE-${CLOE_ROOT}/conantest.py}"
     local cloe_launch_exe=(python3 -m cloe_launch)
     local cloe_launch_args=(-vv shell -c -P "${cloe_profile_file}")