From 5a329202c94d104f8096bbc3224c2bf2878143ea Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Tue, 16 Apr 2024 11:02:44 +0200 Subject: [PATCH] tests/bsim: sysbuild: Set primary MCU idx properly When using sysbuild, set the primary MCU index to be the app core only when we are building the test app in the app core. Otherwise, if the test app is build in the net core, the test command line parameters won't be sent by default to it, and tests will fail. Luckily, these tests are only built in CI using sysbuild when we target the 5340bsim app core, and in all but 2, even if sysbuild was used, this setting was propagated to the zephyr build if we had separate net and app core images. The issue was introduced during the transition to hwmv2. Signed-off-by: Alberto Escolar Piedras --- .../audio_samples/broadcast_audio_sink/Kconfig.sysbuild | 2 +- .../audio_samples/unicast_audio_client/Kconfig.sysbuild | 2 +- tests/bsim/bluetooth/ll/bis/Kconfig.sysbuild | 2 +- tests/bsim/bluetooth/ll/cis/Kconfig.sysbuild | 2 +- tests/bsim/bluetooth/ll/conn/Kconfig.sysbuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild b/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild index 63b369429bd..ff68acec605 100644 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild +++ b/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild @@ -7,4 +7,4 @@ config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int # Let's pass the test arguments to the application MCU test # otherwise by default they would have gone to the net core. - default 0 if $(BOARD) = "nrf5340bsim" + default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP" diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild b/tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild index ad82e381a1c..209d7f1cc73 100644 --- a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild +++ b/tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild @@ -7,4 +7,4 @@ config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int # Let's pass the test arguments to the application MCU test # otherwise by default they would have gone to the net core. - default 0 if $(BOARD) = "nrf5340bsim" + default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP" diff --git a/tests/bsim/bluetooth/ll/bis/Kconfig.sysbuild b/tests/bsim/bluetooth/ll/bis/Kconfig.sysbuild index f534fabcd22..6cf765d44e2 100644 --- a/tests/bsim/bluetooth/ll/bis/Kconfig.sysbuild +++ b/tests/bsim/bluetooth/ll/bis/Kconfig.sysbuild @@ -11,4 +11,4 @@ config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int # Let's pass the test arguments to the application MCU test # otherwise by default they would have gone to the net core. - default 0 if $(BOARD) = "nrf5340bsim" + default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP" diff --git a/tests/bsim/bluetooth/ll/cis/Kconfig.sysbuild b/tests/bsim/bluetooth/ll/cis/Kconfig.sysbuild index f534fabcd22..6cf765d44e2 100644 --- a/tests/bsim/bluetooth/ll/cis/Kconfig.sysbuild +++ b/tests/bsim/bluetooth/ll/cis/Kconfig.sysbuild @@ -11,4 +11,4 @@ config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int # Let's pass the test arguments to the application MCU test # otherwise by default they would have gone to the net core. - default 0 if $(BOARD) = "nrf5340bsim" + default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP" diff --git a/tests/bsim/bluetooth/ll/conn/Kconfig.sysbuild b/tests/bsim/bluetooth/ll/conn/Kconfig.sysbuild index f534fabcd22..6cf765d44e2 100644 --- a/tests/bsim/bluetooth/ll/conn/Kconfig.sysbuild +++ b/tests/bsim/bluetooth/ll/conn/Kconfig.sysbuild @@ -11,4 +11,4 @@ config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int # Let's pass the test arguments to the application MCU test # otherwise by default they would have gone to the net core. - default 0 if $(BOARD) = "nrf5340bsim" + default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"