[nrf noup] Bluetooth: Fix building tests for the zephyr link layer

After nrfconnect/sdk-nrf#16819 and #1940 the Zephyr Link Layer device tree node is disabled. This commit enables the node by applying the snippet for test cases that requires it. Signed-off-by: Rubin Gerritsen <[email protected]>
nrfconnect · Sep 4, 2024 · 9b7a14d · 9b7a14d
1 parent 1ab7966
commit 9b7a14d
Show file tree

Hide file tree

Showing 43 changed files with 195 additions and 65 deletions.
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
@@ -12,7 +12,9 @@ tests:
       - qemu_cortex_m3
 
   sample.bluetooth.beacon-coex:
-    extra_args: CONF_FILE="prj-coex.conf"
+    extra_args:
+      - CONF_FILE="prj-coex.conf"
+      - SNIPPET="bt-ll-sw-split"
     harness: bluetooth
     platform_allow: nrf52840dk/nrf52840
     tags: bluetooth
diff --git a/samples/bluetooth/broadcast_audio_sink/sample.yaml b/samples/bluetooth/broadcast_audio_sink/sample.yaml
@@ -24,5 +24,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/broadcast_audio_source/sample.yaml b/samples/bluetooth/broadcast_audio_source/sample.yaml
@@ -25,5 +25,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/central_iso/sample.yaml b/samples/bluetooth/central_iso/sample.yaml
@@ -11,11 +11,9 @@ tests:
   sample.bluetooth.central_iso.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
-      - qemu_cortex_m3
-      - qemu_x86
       - nrf52_bsim
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -14,15 +14,23 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.central.aod:
+  sample.bluetooth.direction_finding.central.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.central.aod_host_only:
+    harness: bluetooth
+    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -12,14 +12,21 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod:
+  sample.bluetooth.direction_finding_connectionless_rx.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless_rx.aod_host_only:
+    harness: bluetooth
+    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -12,14 +12,19 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless.aoa:
+  sample.bluetooth.direction_finding_connectionless.aoa_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args: OVERLAY_CONFIG="overlay-aoa.conf" SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless.aoa_host_only:
+    harness: bluetooth
+    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.peripheral.aod:
+  sample.bluetooth.direction_finding.peripheral.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.peripheral.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/hci_ipc/sample.yaml b/samples/bluetooth/hci_ipc/sample.yaml
@@ -15,7 +15,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_broadcast.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -26,7 +28,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_receive.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -36,7 +40,9 @@ tests:
   sample.bluetooth.hci_ipc.bis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -46,7 +52,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_central.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -56,7 +64,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_peripheral.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -66,7 +76,9 @@ tests:
   sample.bluetooth.hci_ipc.cis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -76,7 +88,9 @@ tests:
   sample.bluetooth.hci_ipc.iso.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340bsim/nrf5340/cpunet
@@ -88,6 +102,7 @@ tests:
     extra_args:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
@@ -98,13 +113,16 @@ tests:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
       - CONFIG_BT_CTLR_PHY_CODED=n
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
   sample.bluetooth.hci_ipc.mesh.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
diff --git a/samples/bluetooth/hci_vs_scan_req/sample.yaml b/samples/bluetooth/hci_vs_scan_req/sample.yaml
@@ -9,4 +9,5 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_BT_LL_SW_SPLIT=y
+    extra_args: SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/public_broadcast_sink/sample.yaml b/samples/bluetooth/public_broadcast_sink/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/public_broadcast_source/sample.yaml b/samples/bluetooth/public_broadcast_source/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/unicast_audio_client/sample.yaml b/samples/bluetooth/unicast_audio_client/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/unicast_audio_server/sample.yaml b/samples/bluetooth/unicast_audio_server/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/tests/bluetooth/controller/ctrl_api/testcase.yaml b/tests/bluetooth/controller/ctrl_api/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_api.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_chmu.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_create.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_terminate.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_collision/testcase.yaml b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_collision.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
@@ -7,11 +7,13 @@ common:
 tests:
   bluetooth.controller.ctrl_conn_update.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_conn_update.apm_test:
     type: unit
-    extra_args: CONF_FILE=prj_apm.conf
+    extra_args: CONF_FILE=prj_apm.conf SNIPPET="bt-ll-sw-split"
+
 
   bluetooth.controller.ctrl_conn_update.no_param_req_test:
     type: unit
-    extra_args: CONF_FILE=prj_no_param_req.conf
+    extra_args: CONF_FILE=prj_no_param_req.conf SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_cte_req.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
@@ -6,11 +6,12 @@ common:
 tests:
   bluetooth.controller.ctrl_data_length_update.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nocodedphy:
     type: unit
-    extra_args: CONF_FILE=prj_nocoded.conf
+    extra_args: CONF_FILE=prj_nocoded.conf SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nophy:
     type: unit
-    extra_args: CONF_FILE=prj_nophy.conf
+    extra_args: CONF_FILE=prj_nophy.conf SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_encrypt.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_feature_exchange.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_hci/testcase.yaml b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_hci.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_invalid.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_le_ping.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_min_used_chans.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
@@ -6,6 +6,7 @@ common:
 tests:
   bluetooth.controller.ctrl_phy_update.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
   bluetooth.controller.ctrl_phy_update.test_reduced_buf:
     type: unit
-    extra_args: CONF_FILE=prj_rx_cnt.conf
+    extra_args: CONF_FILE=prj_rx_cnt.conf SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_sca_update.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
@@ -6,3 +6,4 @@ common:
 tests:
   bluetooth.controller.ctrl_terminate.test:
     type: unit
+    extra_args: SNIPPET="bt-ll-sw-split"