From 59d9bb6a54cb4401135fea8a0bf5d612d526af01 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 26 Sep 2022 16:32:20 -0400 Subject: [PATCH] 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 --- scripts/build/builders/host.py | 3 +++ scripts/build/testdata/build_linux_on_x64.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py index faa664b558c15d..63de9aeddff126 100644 --- 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 index 0f4069fbdab319..dbf58430c638a3 100644 --- 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