Modified the builder script for efr32-brdxxxx-unit-test to generate the flashbundle for the whole set of tests, and fixed what files get copied to the artifacts directory.

Author: feasel0

build/chip/chip_test_suite.gni

@@ -59,7 +59,12 @@ template("chip_test_suite") {
     _target_type = "source_set"
   }
   target(_target_type, "${_suite_name}.lib") {
-    forward_variables_from(invoker, "*", [ "tests", "test_sources" ])
+    forward_variables_from(invoker,
+                           "*",
+                           [
+                             "tests",
+                             "test_sources",
+                           ])
 
     output_dir = "${root_out_dir}/lib"
 
@@ -92,15 +97,12 @@ template("chip_test_suite") {
       pw_test(_test_name) {
         # Forward certain variables from the invoker.
         forward_variables_from(invoker,
-                              [
-                                "deps",
-                                "public_deps",
-                                "cflags",
-                                "configs",
-                              ])
-
-        # Link to the common lib for this suite so we get its `sources`.
-        public_deps += [ ":${_suite_name}.lib" ]
+                               [
+                                 "deps",
+                                 "public_deps",
+                                 "cflags",
+                                 "configs",
+                               ])
 
         # Set variables that the platform executable may need.
         if (test_executable_output_name != "") {
@@ -126,7 +128,7 @@ template("chip_test_suite") {
       deps += [ ":${_test}" ]
     }
 
-    # Add the common library.
+    # Add the common lib for this suite so we get its `sources`.
     deps += [ ":${_suite_name}.lib" ]
   }
 

scripts/build/builders/efr32.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import glob
+import logging
 import os
 import shlex
 import subprocess
@@ -78,7 +80,7 @@ def FlashBundleName(self):
         elif self == Efr32App.PUMP:
             return 'pump_app.flashbundle.txt'
         elif self == Efr32App.UNIT_TEST:
-            return 'efr32_device_tests.flashbundle.txt'
+            return os.path.join('tests', 'efr32_device_tests.flashbundle.txt')
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -259,13 +261,44 @@ def __init__(self,
     def GnBuildArgs(self):
         return self.extra_gn_options
 
+    def _bundle(self):
+        # Only unit-test needs to generate the flashbundle here.  All other examples will generate a flashbundle via the silabs_executable template.
+        if self.app == Efr32App.UNIT_TEST:
+            flash_bundle_path = os.path.join(self.output_dir, self.app.FlashBundleName())
+            logging.info(f'Generating flashbundle {flash_bundle_path}')
+
+            patterns = [
+                os.path.join(self.output_dir, "tests", "*.flash.py"),
+                os.path.join(self.output_dir, "tests", "*.s37"),
+                os.path.join(self.output_dir, "tests", "silabs_firmware_utils.py"),
+                os.path.join(self.output_dir, "tests", "firmware_utils.py"),
+            ]
+
+            # Generate the list of files by globbing each pattern.
+            files = []
+            for pattern in patterns:
+                files += list(map(lambda x: os.path.basename(x), glob.glob(pattern)))
+            
+            # Create the bundle file.
+            with open(flash_bundle_path, 'w') as bundle_file:
+                bundle_file.write("\n".join(files))
+
     def build_outputs(self):
         extensions = ["out", "hex"]
         if self.options.enable_link_map_file:
             extensions.append("out.map")
-        for ext in extensions:
-            name = f"{self.app.AppNamePrefix()}.{ext}"
-            yield BuilderOutput(os.path.join(self.output_dir, name), name)
+
+        if self.app == Efr32App.UNIT_TEST:
+            # Efr32 unit-test generates the "tests" subdir with a set of files for each individual unit test source.
+            for ext in extensions:
+                pattern = os.path.join(self.output_dir, "tests", f"*.{ext}")
+                for name in map(lambda x: os.path.basename(x), glob.glob(pattern)):
+                    yield BuilderOutput(os.path.join(self.output_dir, "tests", name), name)
+        else:
+            # All other examples have just one set of files.
+            for ext in extensions:
+                name = f"{self.app.AppNamePrefix()}.{ext}"
+                yield BuilderOutput(os.path.join(self.output_dir, name), name)
 
         if self.app == Efr32App.UNIT_TEST:
             # Include test runner python wheels
@@ -275,11 +308,17 @@ def build_outputs(self):
                         os.path.join(root, file),
                         os.path.join("chip_pw_test_runner_wheels", file))
 
-        # Figure out flash bundle files and build accordingly
+    def bundle_outputs(self):
+        # If flashbundle creation is enabled, the outputs will include the s37 and flash.py files, plus the two firmware utils scripts that support flash.py.
+        # For the unit-test example, there will be a s37 and flash.py file for each unit test source.
         with open(os.path.join(self.output_dir, self.app.FlashBundleName())) as f:
             for name in filter(None, [x.strip() for x in f.readlines()]):
+                if self.app == Efr32App.UNIT_TEST:
+                    sourcepath = os.path.join(self.output_dir, "tests", name)  # Unit tests are in the "tests" subdir.
+                else:
+                    sourcepath = os.path.join(self.output_dir, name)
                 yield BuilderOutput(
-                    os.path.join(self.output_dir, name),
+                    sourcepath,
                     os.path.join("flashbundle", name))
 
     def generate(self):

src/test_driver/efr32/BUILD.gn

@@ -105,6 +105,8 @@ source_set("efr32_test_main") {
   include_dirs = [ "${chip_root}/examples/common/pigweed/efr32" ]
 }
 
+# This target is referred to by BuildRoot in scripts/build/builders/efr32.py, as well as the example in README.md.
+# It builds the root target "src:tests", which builds the chip_test_suite target in each test directory, which builds a pw_test target for each test source file, which builds a silabs_executable, which includes the "efr32_test_main" target defined above.
 group("efr32") {
   deps = [ "${chip_root}/src:tests" ]
 }

src/test_driver/efr32/args.gni

@@ -43,7 +43,7 @@ pw_unit_test_EXECUTABLE_TARGET_TYPE_FILE =
 pw_unit_test_MAIN = "//:efr32_test_main"
 
 # Additional variables needed by silabs_executable that must be passed in to pw_test.
-test_executable_output_name = "matter-silabs-device_tests_"
+test_executable_output_name = "matter-silabs-device_tests-"
 test_executable_output_name_suffix = ".out"
 _ldscript =
     "${chip_root}/examples/platform/silabs/ldscripts/${silabs_family}.ld"