Addressed PR comments from @andy31415.

Author: shaoltan-amazon

scripts/build/build/targets.py

@@ -189,6 +189,7 @@ def BuildHostTarget():
     target.AppendModifier('evse-test-event', enable_test_event_triggers=['EVSE']).OnlyIfRe('-energy-management')
     target.AppendModifier('enable-dnssd-tests', enable_dnssd_tests=True).OnlyIfRe('-tests')
     target.AppendModifier('disable-dnssd-tests', enable_dnssd_tests=False).OnlyIfRe('-tests')
+    target.AppendModifier('chip-casting-simplified', chip_casting_simplified=True).OnlyIfRe('-tv-casting-app')
 
     return target
 

scripts/build/builders/host.py

@@ -313,7 +313,8 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
                  use_coverage=False, use_dmalloc=False, minmdns_address_policy=None,
                  minmdns_high_verbosity=False, imgui_ui=False, crypto_library: HostCryptoLibrary = None,
                  enable_test_event_triggers=None,
-                 enable_dnssd_tests: Optional[bool] = None
+                 enable_dnssd_tests: Optional[bool] = None,
+                 chip_casting_simplified=None
                  ):
         super(HostBuilder, self).__init__(
             root=os.path.join(root, 'examples', app.ExamplePath()),
@@ -428,6 +429,10 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
             else:
                 self.extra_gn_options.append('chip_enable_dnssd_tests=false')
 
+        if chip_casting_simplified is not None:
+            if chip_casting_simplified:
+                self.extra_gn_options.append('chip_casting_simplified=true')
+
         if self.board == HostBoard.ARM64:
             if not use_clang:
                 raise Exception("Cross compile only supported using clang")

scripts/tests/run_tv_casting_test.py

@@ -64,7 +64,7 @@ def __exit__(self, exception_type, exception_value, traceback):
         self.process.wait()
 
 
-def remove_cached_files(cached_file_pattern: str) -> bool:
+def remove_cached_files(cached_file_pattern: str):
     """Remove any cached files that match the provided pattern."""
 
     cached_files = glob.glob(cached_file_pattern)  # Returns a list of paths that match the pattern.
@@ -73,10 +73,8 @@ def remove_cached_files(cached_file_pattern: str) -> bool:
         try:
             os.remove(cached_file)
         except OSError as e:
-            logging.error(f'Failed to remove cached file `{cached_file}` with error: `{e.strerror}`.')
-            return False
-
-    return True
+            logging.error(f'Failed to remove cached file `{cached_file}` with error: `{e.strerror}`')
+            raise  # Re-raise the OSError to propagate it up.
 
 
 def dump_temporary_logs_to_console(log_file_path: str):
@@ -351,8 +349,12 @@ def test_casting_fn(tv_app_rel_path, tv_casting_app_rel_path):
 if __name__ == '__main__':
 
     # Start with a clean slate by removing any previously cached entries.
-    cached_file_pattern = '/tmp/chip_*'
-    if not remove_cached_files(cached_file_pattern):
+    try:
+        cached_file_pattern = '/tmp/chip_*'
+        remove_cached_files(cached_file_pattern)
+    except OSError as e:
+        logging.error(
+            f'Error while removing cached files with file pattern: {cached_file_pattern}')
         sys.exit(1)
 
     # Test casting (discovery and commissioning) between the Linux tv-casting-app and the tv-app.