tooling: Fix package_id affected by test and pedantic options

Author: cassava

conanfile.py

@@ -10,16 +10,19 @@ class Cloe(ConanFile):
     topics = ["simulation"]
     settings = "os", "compiler", "build_type", "arch"
     options = {
-        "test": [True, False],
-        "pedantic": [True, False],
         "with_vtd": [True, False],
         "with_engine": [True, False],
+
+        # Doesn't affect package ID:
+        "test": [True, False],
+        "pedantic": [True, False],
     }
     default_options = {
-        "test": True,
-        "pedantic": True,
         "with_vtd": False,
         "with_engine": True,
+
+        "test": True,
+        "pedantic": True,
     }
     generators = "cmake"
     no_copy_source = True
@@ -84,3 +87,7 @@ def package(self):
         if not self.in_local_cache:
             cmake = self._configure_cmake()
             cmake.install()
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

engine/conanfile.py

@@ -89,6 +89,8 @@ def package(self):
 
     def package_id(self):
         self.info.requires["boost"].full_package_mode()
+        del self.info.options.test
+        del self.info.options.pedantic
 
     def package_info(self):
         if self.settings.os == "Linux":

fable/conanfile.py

@@ -73,6 +73,8 @@ def package(self):
 
     def package_id(self):
         self.info.requires["boost"].full_package_mode()
+        del self.info.options.test
+        del self.info.options.pedantic
 
     def package_info(self):
         if self.in_local_cache:

models/conanfile.py

@@ -73,6 +73,8 @@ def package(self):
 
     def package_id(self):
         self.info.requires["boost"].full_package_mode()
+        del self.info.options.test
+        del self.info.options.pedantic
 
     def package_info(self):
         # Make sure we can find the library, both in editable mode and in the

oak/conanfile.py

@@ -74,3 +74,7 @@ def package_info(self):
             self.cpp_info.libs = tools.collect_libs(self)
         else:
             self.cpp_info.libs = ["cloe-oak"]
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

plugins/basic/conanfile.py

@@ -65,3 +65,7 @@ def build(self):
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

plugins/gndtruth_extractor/conanfile.py

@@ -61,3 +61,7 @@ def build(self):
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

plugins/minimator/conanfile.py

@@ -51,3 +51,6 @@ def build(self):
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
+
+    def package_id(self):
+        del self.info.options.pedantic

plugins/minimator/tests/profile_default.py

@@ -6,6 +6,9 @@ class CloeTest(ConanFile):
     name = "cloe-minimator-test"
     settings = "os", "compiler", "build_type", "arch"
     generators = "virtualenv", "virtualrunenv"
+    default_options = {
+        "cloe-engine:server": False,
+    }
 
     def set_version(self):
         version_file = Path(self.recipe_folder) / "../../../VERSION"

plugins/mocks/conanfile.py

@@ -51,3 +51,7 @@ def build(self):
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

plugins/noisy_sensor/conanfile.py

@@ -61,3 +61,7 @@ def build(self):
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

plugins/speedometer/conanfile.py

@@ -51,3 +51,7 @@ def build(self):
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

plugins/virtue/conanfile.py

@@ -51,3 +51,7 @@ def build(self):
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

plugins/virtue/tests/profile_default.py

@@ -6,6 +6,9 @@ class CloeTest(ConanFile):
     name = "cloe-minimator-test"
     settings = "os", "compiler", "build_type", "arch"
     generators = "virtualenv", "virtualrunenv"
+    default_options = {
+        "cloe-engine:server": False,
+    }
 
     def set_version(self):
         version_file = Path(self.recipe_folder) / "../../../VERSION"

plugins/vtd/conanfile.py

@@ -113,3 +113,7 @@ def package_id(self):
     def package_info(self):
         self.env_info.VTD_LAUNCH = f"{self.package_folder}/bin/vtd-launch"
         self.env_info.VTD_SETUP_DIR = f"{self.package_folder}/{self._setup_folder}"
+
+    def package_id(self):
+        del self.info.options.test
+        del self.info.options.pedantic

runtime/conanfile.py

@@ -78,6 +78,8 @@ def package(self):
 
     def package_id(self):
         self.info.requires["boost"].full_package_mode()
+        del self.info.options.test
+        del self.info.options.pedantic
 
     def package_info(self):
         # Make sure we can find the libs and *.cmake files, both in editable