Skip to content

Commit 37323c5

Browse files
committed
zephyr: native_sim: run boot tests at boot if STANDALONE enabled
Only run sof_run_boot_tests() at boot for QEMU or native_sim (STANDALONE) targets. Other platforms trigger via IPC.
1 parent 010d4af commit 37323c5

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

app/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void sys_arch_reboot(int type)
8989
void test_main(void)
9090
{
9191
sof_app_main();
92-
#if defined(QEMU_BOOT_TESTS) || CONFIG_SOF_BOOT_TEST_STANDALONE
92+
#if CONFIG_SOF_BOOT_TEST && (defined(QEMU_BOOT_TESTS) || CONFIG_SOF_BOOT_TEST_STANDALONE)
9393
sof_run_boot_tests();
9494
#if defined(QEMU_BOOT_TESTS)
9595
qemu_xtensa_exit(0);

scripts/xtensa-build-zephyr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,7 @@ def install_platform(platform, sof_output_dir, platf_build_environ, platform_wco
11761176

11771177
os.makedirs(install_key_dir, exist_ok=True)
11781178
# looses file owner and group - file is commonly accessible, dont install qemu.
1179-
if platform not in ("qemu_xtensa", "qemu_xtensa_mmu"):
1179+
if platform not in ("qemu_xtensa", "qemu_xtensa_mmu", "native_sim"):
11801180
shutil.copy2(abs_build_dir / "zephyr.ri", install_key_dir / output_fwname)
11811181

11821182
if args.deployable_build and platform_configs[platform].ipc4:
@@ -1330,7 +1330,7 @@ def gzip_compress(fname, gzdst=None):
13301330
RI_INFO_UNSUPPORTED += ['imx8', 'imx8x', 'imx8m', 'imx8m_cm7', 'imx8ulp', 'imx95']
13311331
RI_INFO_UNSUPPORTED += ['rn', 'acp_6_0', 'acp_7_0']
13321332
RI_INFO_UNSUPPORTED += ['mt8186', 'mt8188', 'mt8195', 'mt8196', 'mt8365']
1333-
RI_INFO_UNSUPPORTED += ['qemu_xtensa', 'qemu_xtensa_mmu']
1333+
RI_INFO_UNSUPPORTED += ['qemu_xtensa', 'qemu_xtensa_mmu', 'native_sim']
13341334

13351335

13361336
# For temporary workarounds. Unlike _UNSUPPORTED above, the platforms below will print a warning.

0 commit comments

Comments
 (0)