setup: Make validate_config to check for specified archs

Up until now we could have a CONFIG_ being set on an archtecture and not
on others and then it would pass the checks, only complaining for a missing
symbol later on the setup phase.

IIRC this used to work in the past, but somehow it got broken. Added a test
to ensure that we catch such cases in the future.

Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>

klpbuild/klplib/codestream.py

@@ -244,14 +244,24 @@ def get_all_configs(self, conf):
 
         return configs
 
-
-    def validate_config(self, conf, mod):
+    def validate_config(self, archs, conf, mod):
         configs = {}
+        cs_config = self.get_all_configs(conf)
 
         # Validate only the specified architectures, but check if the codestream
         # is supported on that arch (like RT that is currently supported only on
         # x86_64)
-        for arch, conf_entry in self.get_all_configs(conf).items():
+        for arch in archs:
+            # Check if the desired CONFIG entry is set on the codestreams's supported
+            # architectures, by iterating on the specified architectures from the setup command.
+            if arch not in self.archs:
+                continue
+
+            try:
+                conf_entry = cs_config.pop(arch)
+            except KeyError as exc:
+                raise RuntimeError(f"{self.name()}: {conf} not set on {arch}. Aborting") from exc
+
             if conf_entry == "m" and mod == "vmlinux":
                 raise RuntimeError(f"{self.name()}:{arch} ({self.kernel}): Config {conf} is set as module, but no module was specified")
             if conf_entry == "y" and mod != "vmlinux":

klpbuild/plugins/setup.py

@@ -142,6 +142,7 @@ def setup_codestreams(lp_name, data):
                          patched_cs=new_patched_cs, cve=data['cve'])
     return codestreams
 
+
 def setup_project_files(lp_name, codestreams, ffuncs, archs):
     utils.get_workdir(lp_name).mkdir(exist_ok=True)
 
@@ -163,7 +164,7 @@ def setup_project_files(lp_name, codestreams, ffuncs, archs):
         for f, fdata in cs.files.items():
 
             mod = fdata["module"]
-            cs.validate_config(fdata["conf"], mod)
+            cs.validate_config(archs, fdata["conf"], mod)
 
             sdir = cs.get_src_dir()
             if not Path(sdir, f).is_file():

tests/test_setup.py

@@ -135,3 +135,35 @@ def test_valite_conf_mod_file_funcs():
     assert sch["module"] == "sch_qfq"
     assert bts["conf"] == "CONFIG_BT_HCIBTSDIO"
     assert bts["module"] == "btsdio"
+
+
+def test_valite_conf_unsupported_arch():
+    # Make sure we error out in the case of a configuration entry that is not enabled
+    # on a codestream
+    lp = "bsc_" + inspect.currentframe().f_code.co_name
+
+    # CONFIG_HID is not enabled on s390x, so setup should fail here
+    LP_DEFAULT_DATA = {"cve": None, "lp_filter": CS, "conf": "CONFIG_HID", "no_check": False}
+    with pytest.raises(RuntimeError, match=rf"{CS}: CONFIG_HID not set on s390x"):
+        setup_args = {
+            "lp_name": lp,
+            "archs": utils.ARCHS,
+            "module": "vmlinux",
+            "file_funcs": [["drivers/hid/hid-core.c", "hid_alloc_report_buf"]],
+            "mod_file_funcs": [],
+            "conf_mod_file_funcs": [],
+            **LP_DEFAULT_DATA
+        }
+        setup(**setup_args)
+
+    # It shoudl succeed when s390x is removed from the setup command
+    setup_args = {
+        "lp_name": lp,
+        "archs": ["x86_64", "ppc64le"],
+        "module": "vmlinux",
+        "file_funcs": [["drivers/hid/hid-core.c", "hid_alloc_report_buf"]],
+        "mod_file_funcs": [],
+        "conf_mod_file_funcs": [],
+        **LP_DEFAULT_DATA
+    }
+    setup(**setup_args)