fix: add disabled apps to junit with --include-all-apps flag

Author: achxkloel

idf_build_apps/app.py

@@ -511,7 +511,9 @@ def build(
             BuildStatus.UNKNOWN,
             BuildStatus.SHOULD_BE_BUILT,
         ):
-            self.build_comment = f'Build {self.build_status.value}. Skipping...'
+            if not self.build_comment:
+                self.build_comment = f'Build {self.build_status.value}. Skipping...'
+
             return
 
         # real build starts here

idf_build_apps/main.py

@@ -22,6 +22,7 @@
     BuildArguments,
     DumpManifestShaArguments,
     FindArguments,
+    FindBuildArguments,
     add_args_to_parser,
     apply_config_file,
 )
@@ -386,23 +387,32 @@ def main():
         sys.exit(0)
 
     kwargs = vars(args)
+    kwargs_without_none = drop_none_kwargs(kwargs)
     action = kwargs.pop('action')
     config_file = kwargs.pop('config_file')
     if config_file:
         apply_config_file(config_file)
 
     if action == 'dump-manifest-sha':
-        arguments = DumpManifestShaArguments(**drop_none_kwargs(kwargs))
+        arguments = DumpManifestShaArguments(**kwargs_without_none)
         Manifest.from_files(arguments.manifest_files).dump_sha_values(arguments.output)
         sys.exit(0)
-    elif action == 'find':
-        arguments = FindArguments(**drop_none_kwargs(kwargs))
+
+    if action == 'find':
+        arguments = FindArguments(**kwargs_without_none)
+        find_arguments = arguments
     else:
-        arguments = BuildArguments(**drop_none_kwargs(kwargs))
+        arguments = BuildArguments(**kwargs_without_none)
+
+        # Because build needs to find apps, we need to create find_arguments here
+        find_arguments = FindArguments(
+            **{k: v for k, v in kwargs_without_none.items() if k in FindBuildArguments.model_fields}
+        )
 
     # real call starts here
     # build also needs to find first
-    apps = find_apps(args.paths, args.target, find_arguments=arguments)
+    apps = find_apps(args.paths, args.target, find_arguments=find_arguments)
+
     if isinstance(arguments, FindArguments):  # find only
         if arguments.output:
             os.makedirs(os.path.dirname(os.path.realpath(arguments.output)), exist_ok=True)
@@ -444,6 +454,12 @@ def main():
         for app in failed_apps:
             print(f'  {app}')
 
+    disabled_apps = [app for app in apps if app.build_status == BuildStatus.DISABLED]
+    if disabled_apps:
+        print('Disabled the following apps:')
+        for app in disabled_apps:
+            print(f'  {app}')
+
     if ret_code != 0:
         sys.exit(ret_code)
 

tests/test_build.py

@@ -129,6 +129,8 @@ def test_build_with_junit_output(self, tmp_path):
         with open('test.xml') as f:
             xml = ElementTree.fromstring(f.read())
 
+        print(ElementTree.tostring(xml, encoding='utf8').decode('utf8'))
+
         test_suite = xml.findall('testsuite')[0]
         assert test_suite.attrib['tests'] == '0'
         assert test_suite.attrib['failures'] == '0'

tests/test_finder.py

@@ -138,7 +138,7 @@ def test_include_disabled_apps(self, tmp_path):
         for app in apps:
             assert app.build_status == BuildStatus.DISABLED
             app.build()
-            assert app.build_comment == 'Build disabled. Skipping...'
+            assert app.build_comment.startswith('Not enabled by manifest rules:')
 
 
 class TestFindWithModifiedFilesComponents: