From dca600bd19945050c1ddfb04d1443b4443a86302 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 11 Apr 2023 09:42:36 -0500 Subject: [PATCH] samples/tests: bluetooth: Remove qemu_cortex_m3 Remove qemu_cortex_m3 from various bluetooth tests and samples since they enable NVS which requires CONFIG_FLASH_PAGE_LAYOUT which is not supported on qemu_cortex_m3 since there is no flash driver. We get build failures with the arm-clang compiler because nvs.c is referencing z_impl_flash_get_page_info_by_offs which does not exist. Switch to qemu_x86 as the integration_platforms if it was qemu_cortex_m3 before. Removed the bluetooth.mesh.mesh_shell.reduced_legacy as this was added specifically for building on qemu_cortex_m3. Signed-off-by: Kumar Gala --- samples/bluetooth/central_iso/sample.yaml | 4 ++-- samples/bluetooth/direct_adv/sample.yaml | 4 ++-- samples/bluetooth/mesh_provisioner/sample.yaml | 4 ++-- samples/bluetooth/peripheral/sample.yaml | 4 ++-- .../bluetooth/peripheral_accept_list/sample.yaml | 2 +- samples/bluetooth/peripheral_hids/sample.yaml | 8 ++++---- samples/bluetooth/peripheral_iso/sample.yaml | 4 ++-- tests/bluetooth/mesh_shell/reduced_legacy.conf | 14 -------------- tests/bluetooth/mesh_shell/testcase.yaml | 3 --- tests/bluetooth/shell/testcase.yaml | 2 +- 10 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 tests/bluetooth/mesh_shell/reduced_legacy.conf diff --git a/samples/bluetooth/central_iso/sample.yaml b/samples/bluetooth/central_iso/sample.yaml index 8f68a987610..0cdbb7a501c 100644 --- a/samples/bluetooth/central_iso/sample.yaml +++ b/samples/bluetooth/central_iso/sample.yaml @@ -4,7 +4,7 @@ sample: tests: sample.bluetooth.central_iso: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 + platform_allow: qemu_x86 integration_platforms: - - qemu_cortex_m3 + - qemu_x86 tags: bluetooth diff --git a/samples/bluetooth/direct_adv/sample.yaml b/samples/bluetooth/direct_adv/sample.yaml index b85b1dbfc54..c6c2463203e 100644 --- a/samples/bluetooth/direct_adv/sample.yaml +++ b/samples/bluetooth/direct_adv/sample.yaml @@ -3,7 +3,7 @@ sample: tests: sample.bluetooth.direct_adv: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 + platform_allow: qemu_x86 integration_platforms: - - qemu_cortex_m3 + - qemu_x86 tags: bluetooth diff --git a/samples/bluetooth/mesh_provisioner/sample.yaml b/samples/bluetooth/mesh_provisioner/sample.yaml index 359548f7421..02a7e2dabca 100644 --- a/samples/bluetooth/mesh_provisioner/sample.yaml +++ b/samples/bluetooth/mesh_provisioner/sample.yaml @@ -3,7 +3,7 @@ sample: tests: sample.bluetooth.mesh_provisioner: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 nrf52840dk_nrf52840 + platform_allow: qemu_x86 nrf52840dk_nrf52840 integration_platforms: - - qemu_cortex_m3 + - qemu_x86 tags: bluetooth diff --git a/samples/bluetooth/peripheral/sample.yaml b/samples/bluetooth/peripheral/sample.yaml index e493f8368a5..5fb2036dd57 100644 --- a/samples/bluetooth/peripheral/sample.yaml +++ b/samples/bluetooth/peripheral/sample.yaml @@ -4,9 +4,9 @@ sample: tests: sample.bluetooth.peripheral: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 nucleo_wb55rg + platform_allow: qemu_x86 nucleo_wb55rg integration_platforms: - - qemu_cortex_m3 + - qemu_x86 tags: bluetooth sample.bluetooth.peripheral.x_nucleo_idb05a1_shield: harness: bluetooth diff --git a/samples/bluetooth/peripheral_accept_list/sample.yaml b/samples/bluetooth/peripheral_accept_list/sample.yaml index af516502e16..2aa0f00c498 100644 --- a/samples/bluetooth/peripheral_accept_list/sample.yaml +++ b/samples/bluetooth/peripheral_accept_list/sample.yaml @@ -3,5 +3,5 @@ sample: tests: sample.bluetooth.peripheral_accept_list: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 + platform_allow: qemu_x86 tags: bluetooth diff --git a/samples/bluetooth/peripheral_hids/sample.yaml b/samples/bluetooth/peripheral_hids/sample.yaml index 1c73ba4e45d..9dcbb74de3d 100644 --- a/samples/bluetooth/peripheral_hids/sample.yaml +++ b/samples/bluetooth/peripheral_hids/sample.yaml @@ -4,15 +4,15 @@ sample: tests: sample.bluetooth.peripheral_hids: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 + platform_allow: qemu_x86 tags: bluetooth integration_platforms: - - qemu_cortex_m3 + - qemu_x86 sample.bluetooth.peripheral_hids.no_authentication: harness: bluetooth extra_configs: - CONFIG_SAMPLE_BT_USE_AUTHENTICATION=n - platform_allow: qemu_cortex_m3 qemu_x86 + platform_allow: qemu_x86 tags: bluetooth integration_platforms: - - qemu_cortex_m3 + - qemu_x86 diff --git a/samples/bluetooth/peripheral_iso/sample.yaml b/samples/bluetooth/peripheral_iso/sample.yaml index 0c457c6deb6..29e859e341c 100644 --- a/samples/bluetooth/peripheral_iso/sample.yaml +++ b/samples/bluetooth/peripheral_iso/sample.yaml @@ -4,7 +4,7 @@ sample: tests: sample.bluetooth.peripheral_iso: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 + platform_allow: qemu_x86 tags: bluetooth integration_platforms: - - qemu_cortex_m3 + - qemu_x86 diff --git a/tests/bluetooth/mesh_shell/reduced_legacy.conf b/tests/bluetooth/mesh_shell/reduced_legacy.conf deleted file mode 100644 index c3a9bfb447f..00000000000 --- a/tests/bluetooth/mesh_shell/reduced_legacy.conf +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG_BT_EXT_ADV=n -CONFIG_LOG_MODE_MINIMAL=y - -CONFIG_BT_SETTINGS=n -CONFIG_FLASH=n -CONFIG_FLASH_PAGE_LAYOUT=n -CONFIG_FLASH_MAP=n -CONFIG_NVS=n -CONFIG_SETTINGS=n - -CONFIG_BT_MESH_LOW_POWER=n -CONFIG_BT_MESH_FRIEND=n -CONFIG_BT_MESH_PB_GATT=n -CONFIG_BT_MESH_GATT_PROXY=n diff --git a/tests/bluetooth/mesh_shell/testcase.yaml b/tests/bluetooth/mesh_shell/testcase.yaml index de60fc6a6ea..d9ae713147c 100644 --- a/tests/bluetooth/mesh_shell/testcase.yaml +++ b/tests/bluetooth/mesh_shell/testcase.yaml @@ -7,6 +7,3 @@ tests: integration_platforms: - qemu_x86 platform_exclude: nrf52dk_nrf52810 - bluetooth.mesh.mesh_shell.reduced_legacy: - platform_allow: qemu_cortex_m3 - extra_args: OVERLAY_CONFIG=reduced_legacy.conf diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml index 6fde1ff56a3..7f8419700b9 100644 --- a/tests/bluetooth/shell/testcase.yaml +++ b/tests/bluetooth/shell/testcase.yaml @@ -2,7 +2,7 @@ tests: bluetooth.shell.main: extra_configs: - CONFIG_NATIVE_UART_0_ON_STDINOUT=y - platform_allow: qemu_cortex_m3 qemu_x86 native_posix native_posix_64 nrf52840dk_nrf52840 + platform_allow: qemu_x86 native_posix native_posix_64 nrf52840dk_nrf52840 integration_platforms: - qemu_x86 platform_exclude: nrf52dk_nrf52810