[nrf fromlist] tests: Bluetooth: Mesh: Default to ext adv

HaavardRei · rlubos · commit 96fa153d7211 · 2024-05-31T10:35:37.000+02:00
Changes twister tests and nrf samples from using legacy adv to ext adv since this is the default for Mesh. Legacy adv is still tested in bsim. Removes redundant test configuration testing ext adv. Removes redundant config for ext_adv in `multi_ext_adv.conf`. Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no> Upstream PR: zephyrproject-rtos/zephyr#73318
diff --git a/samples/boards/nrf/mesh/onoff-app/prj.conf b/samples/boards/nrf/mesh/onoff-app/prj.conf
@@ -22,7 +22,6 @@ CONFIG_BT_DATA_LEN_UPDATE=n
 CONFIG_BT_PHY_UPDATE=n
 CONFIG_BT_CTLR_CHAN_SEL_2=n
 CONFIG_BT_CTLR_MIN_USED_CHAN=n
-CONFIG_BT_CTLR_ADV_EXT=n
 CONFIG_BT_CTLR_PRIVACY=n
 
 CONFIG_BT_PERIPHERAL=y
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -17,7 +17,6 @@ CONFIG_BT_DATA_LEN_UPDATE=n
 CONFIG_BT_PHY_UPDATE=n
 CONFIG_BT_CTLR_CHAN_SEL_2=n
 CONFIG_BT_CTLR_MIN_USED_CHAN=n
-CONFIG_BT_CTLR_ADV_EXT=n
 CONFIG_BT_CTLR_PRIVACY=n
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
diff --git a/tests/bluetooth/mesh/basic/dbg.conf b/tests/bluetooth/mesh/basic/dbg.conf
@@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=n
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_CTLR_LE_ENC=n
 CONFIG_BT_CTLR_LE_PING=n
diff --git a/tests/bluetooth/mesh/basic/ext_adv.conf b/tests/bluetooth/mesh/basic/ext_adv.conf
diff --git a/tests/bluetooth/mesh/basic/friend.conf b/tests/bluetooth/mesh/basic/friend.conf
@@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=n
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_CTLR_LE_ENC=n
 CONFIG_BT_CTLR_LE_PING=n
diff --git a/tests/bluetooth/mesh/basic/gatt.conf b/tests/bluetooth/mesh/basic/gatt.conf
@@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=n
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_CTLR_LE_ENC=n
 CONFIG_BT_CTLR_LE_PING=n
diff --git a/tests/bluetooth/mesh/basic/lpn.conf b/tests/bluetooth/mesh/basic/lpn.conf
@@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=n
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_CTLR_LE_ENC=n
 CONFIG_BT_CTLR_LE_PING=n
diff --git a/tests/bluetooth/mesh/basic/multi_ext_adv.conf b/tests/bluetooth/mesh/basic/multi_ext_adv.conf
@@ -52,4 +52,3 @@ CONFIG_BT_MESH_ADV_LOG_LEVEL_DBG=y
 
 CONFIG_BT_EXT_ADV_MAX_ADV_SET=3
 CONFIG_BT_MESH_RELAY_ADV_SETS=1
-CONFIG_BT_MESH_ADV_EXT=y
diff --git a/tests/bluetooth/mesh/basic/pb_gatt.conf b/tests/bluetooth/mesh/basic/pb_gatt.conf
@@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=n
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_CTLR_LE_ENC=n
 CONFIG_BT_CTLR_LE_PING=n
diff --git a/tests/bluetooth/mesh/basic/prj.conf b/tests/bluetooth/mesh/basic/prj.conf
@@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=n
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_CTLR_LE_ENC=n
 CONFIG_BT_CTLR_LE_PING=n
diff --git a/tests/bluetooth/mesh/basic/proxy.conf b/tests/bluetooth/mesh/basic/proxy.conf
@@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=n
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_CTLR_LE_ENC=n
 CONFIG_BT_CTLR_LE_PING=n
diff --git a/tests/bluetooth/mesh/basic/testcase.yaml b/tests/bluetooth/mesh/basic/testcase.yaml
@@ -75,17 +75,6 @@ tests:
     tags:
       - bluetooth
       - mesh
-  bluetooth.mesh.ext_adv:
-    build_only: true
-    extra_args: CONF_FILE=ext_adv.conf
-    platform_allow:
-      - qemu_x86
-      - nrf52840dk/nrf52840
-    integration_platforms:
-      - qemu_x86
-    tags:
-      - bluetooth
-      - mesh
   bluetooth.mesh.multi_ext_adv:
     build_only: true
     extra_args: CONF_FILE=multi_ext_adv.conf

Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,3 @@ CONFIG_BT_MESH_ADV_LOG_LEVEL_DBG=y`
`52`	`52`
`53`	`53`	`CONFIG_BT_EXT_ADV_MAX_ADV_SET=3`
`54`	`54`	`CONFIG_BT_MESH_RELAY_ADV_SETS=1`
`55`		`-CONFIG_BT_MESH_ADV_EXT=y`