tests: benchmarks: multicore: idle_wdt: Rework SB_CONFIG_REMOTE_BOARD

Define default REMOTE_BOARD based on build target. Signed-off-by: Sebastian Głąb <[email protected]>
nrfconnect · Dec 2, 2024 · f642fc3 · f642fc3
1 parent 78f8120
commit f642fc3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/tests/benchmarks/multicore/idle_wdt/Kconfig.sysbuild b/tests/benchmarks/multicore/idle_wdt/Kconfig.sysbuild
@@ -7,4 +7,5 @@
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
 
 config REMOTE_BOARD
-	string "The board used for remote target"
+	string
+	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
diff --git a/tests/benchmarks/multicore/idle_wdt/sysbuild.cmake b/tests/benchmarks/multicore/idle_wdt/sysbuild.cmake
@@ -14,9 +14,4 @@ ExternalZephyrProject_Add(
     SOURCE_DIR ${APP_DIR}/remote
     BOARD ${SB_CONFIG_REMOTE_BOARD}
     BOARD_REVISION ${BOARD_REVISION}
-  )
-
-# Add a dependency so that the remote image will be built and flashed first
-add_dependencies(idle_wdt remote)
-# Add dependency so that the remote image is flashed first.
-sysbuild_add_dependencies(FLASH idle_wdt remote)
+)
diff --git a/tests/benchmarks/multicore/idle_wdt/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/multicore/idle_wdt/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
diff --git a/tests/benchmarks/multicore/idle_wdt/testcase.yaml b/tests/benchmarks/multicore/idle_wdt/testcase.yaml
@@ -8,8 +8,6 @@ common:
 
 tests:
   benchmarks.multicore.idle_wdt.nrf54h20dk_cpuapp_cpurad.no_sleep:
-    extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
     harness: console
     harness_config:
       type: multi_line
@@ -22,7 +20,6 @@ tests:
   benchmarks.multicore.idle_wdt.nrf54h20dk_cpuapp_cpurad.idle:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_wdt_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
       idle_wdt_CONFIG_TEST_SLEEP_DURATION_MS=500
@@ -36,7 +33,6 @@ tests:
   benchmarks.multicore.idle_wdt.nrf54h20dk_cpuapp_cpurad.s2ram:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_wdt_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
     harness: pytest