fix(iar): honor per-config <excluded> source files

collect_sources walked every <file> via root.iter('file') and ignored
IAR's <excluded><configuration> markers, so for the selected build
configuration it listed files that config does not compile -- over-
reporting the artifact's source set. Drop a file whose <excluded> block
names the chosen configuration.

Adds tests/test_iar_sbom.py (a file excluded from the selected config is
dropped; one excluded from a different config is kept), wired into
selftest.yml.

Author: MarkAtwood

.github/workflows/selftest.yml

@@ -33,10 +33,14 @@ jobs:
             provenance/bomsh_verify.py \
             tools/wolfglass-sync \
             tests/test_gen_sbom.py \
-            tests/test_sbom.py
+            tests/test_sbom.py \
+            tests/test_iar_sbom.py
 
       - name: Run generator unit tests
         run: python -m unittest tests/test_gen_sbom.py
 
+      - name: Run IAR frontend tests
+        run: python -m unittest tests/test_iar_sbom.py
+
       - name: Run self-test
         run: python tests/test_sbom.py

share/frontends/iar_sbom.py

@@ -61,8 +61,20 @@ def parse_configs(root):
     return configs
 
 
-def collect_sources(root, proj_dir):
-    """Return (present, missing) absolute paths of compiled source files."""
+def _excluded_from(file_el, cfg_name):
+    """True if <file> carries an <excluded> block naming cfg_name -- IAR drops
+    the file from that build configuration, so it is not compiled in."""
+    excluded = file_el.find('excluded')
+    if excluded is None:
+        return False
+    return any((c.text or '').strip() == cfg_name
+               for c in excluded.findall('configuration'))
+
+
+def collect_sources(root, proj_dir, cfg_name):
+    """Return (present, missing) absolute paths of the source files compiled in
+    configuration cfg_name.  Files IAR marks <excluded> for cfg_name are
+    dropped; listing them would over-report the compiled source set."""
     srcs = []
     for file_el in root.iter('file'):
         name_el = file_el.find('name')
@@ -71,6 +83,8 @@ def collect_sources(root, proj_dir):
         raw = name_el.text.strip()
         if not raw.lower().endswith(SRC_EXTS):
             continue
+        if _excluded_from(file_el, cfg_name):
+            continue
         srcs.append(resolve_proj_dir(raw, proj_dir))
     seen, present, missing = set(), [], []
     for s in srcs:
@@ -124,7 +138,7 @@ def main():
         cfg_name = max(configs, key=lambda k: len(configs[k]))
 
     defines = configs[cfg_name]
-    srcs, missing = collect_sources(root, proj_dir)
+    srcs, missing = collect_sources(root, proj_dir, cfg_name)
     if not srcs:
         sys.exit("ERROR: no existing source files found in .ewp")
     if missing:

tests/test_iar_sbom.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+"""Tests for the IAR frontend (share/frontends/iar_sbom.py).
+
+Focus: collect_sources must honour IAR's per-configuration <excluded> markers,
+so a file excluded from the selected build configuration is not reported as a
+compiled source (which would over-report the artifact's source set)."""
+
+import importlib.util
+import os
+import tempfile
+import unittest
+import xml.etree.ElementTree as ET
+
+REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+IAR = os.path.join(REPO, "share", "frontends", "iar_sbom.py")
+
+_spec = importlib.util.spec_from_file_location("iar_sbom", IAR)
+iar = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(iar)
+
+# a.c: compiled in every config; b.c: excluded from Release;
+# c.c: excluded from Debug only.
+_EWP = """<project>
+  <file><name>$PROJ_DIR$/a.c</name></file>
+  <file><name>$PROJ_DIR$/b.c</name>
+    <excluded><configuration>Release</configuration></excluded>
+  </file>
+  <file><name>$PROJ_DIR$/c.c</name>
+    <excluded><configuration>Debug</configuration></excluded>
+  </file>
+</project>"""
+
+
+class TestExcludedFiles(unittest.TestCase):
+    def setUp(self):
+        self.tmp = tempfile.TemporaryDirectory()
+        self.proj = self.tmp.name
+        for n in ("a.c", "b.c", "c.c"):
+            open(os.path.join(self.proj, n), "w").close()
+        self.root = ET.fromstring(_EWP)
+
+    def tearDown(self):
+        self.tmp.cleanup()
+
+    def _names(self, cfg):
+        present, _missing = iar.collect_sources(self.root, self.proj, cfg)
+        return {os.path.basename(p) for p in present}
+
+    def test_release_drops_file_excluded_from_release(self):
+        names = self._names("Release")
+        self.assertIn("a.c", names)
+        self.assertIn("c.c", names)            # excluded from Debug, not Release
+        self.assertNotIn("b.c", names)         # excluded from Release
+
+    def test_debug_drops_file_excluded_from_debug(self):
+        names = self._names("Debug")
+        self.assertIn("a.c", names)
+        self.assertIn("b.c", names)            # excluded from Release, not Debug
+        self.assertNotIn("c.c", names)         # excluded from Debug
+
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)