Fix nltest runner builds (#22878)

* Force a board name for silabs_board so that linux-x64-nl-test-runner can be built * Fix unit tests
project-chip · Jan 5, 2023 · 9c9f207 · 9c9f207
1 parent 46023e8
commit 9c9f207
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py
@@ -297,6 +297,9 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
 
         if app == HostApp.NL_TEST_RUNNER:
             self.build_command = 'runner'
+            # board will NOT be used, but is required to be able to properly
+            # include things added by the test_runner efr32 build
+            self.extra_gn_options.append('silabs_board="BRD4161A"')
 
         # Crypto library has per-platform defaults (like openssl for linux/mac
         # and mbedtls for android/freertos/zephyr/mbed/...)

diff --git a/scripts/build/testdata/build_linux_on_x64.txt b/scripts/build/testdata/build_linux_on_x64.txt
@@ -262,7 +262,7 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/minimal-mdns --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-minmdns-ipv6only
 
 # Generating linux-x64-nl-test-runner
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 {out}/linux-x64-nl-test-runner
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 '--args=silabs_board="BRD4161A"' {out}/linux-x64-nl-test-runner
 
 # Generating linux-x64-ota-provider
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-provider-app/linux --args=chip_config_network_layer_ble=false {out}/linux-x64-ota-provider