tests: bluetooth: tester: Move mesh-1.1 features to a separate conf

This allows to compile mesh tester for 1.0.1 and 1.1 specs sepately.

Signed-off-by: Pavel Vasilyev <[email protected]>

Author: PavelVPV

tests/bluetooth/tester/overlay-mesh-v1d1.conf

@@ -0,0 +1,29 @@
+CONFIG_ENTROPY_GENERATOR=y
+
+CONFIG_BT_MESH_V1d1=y
+CONFIG_BT_MESH_OP_AGG_CLI=y
+CONFIG_BT_MESH_OP_AGG_SRV=y
+# PTS requires more key slots.
+# First one is implicitly taken by Device Key.
+CONFIG_BT_MESH_MODEL_KEY_COUNT=3
+CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
+CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
+CONFIG_BT_MESH_SAR_CFG_SRV=y
+CONFIG_BT_MESH_SAR_CFG_CLI=y
+CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BT_MESH_RPR_SRV=y
+CONFIG_BT_MESH_RPR_CLI=y
+CONFIG_BT_MESH_RPR_AD_TYPES_MAX=2
+CONFIG_BT_MESH_BLOB_CLI=y
+CONFIG_BT_MESH_DFU_CLI=y
+CONFIG_BT_MESH_BLOB_SRV=y
+CONFIG_BT_MESH_DFU_SRV=y
+CONFIG_BT_MESH_DFD_SRV=y
+CONFIG_BT_MESH_DFU_SLOT_CNT=2
+CONFIG_BT_MESH_PRIV_BEACONS=y
+CONFIG_BT_MESH_PRIV_BEACON_SRV=y
+CONFIG_BT_MESH_PRIV_BEACON_CLI=y
+CONFIG_BT_MESH_MODEL_EXTENSIONS=y
+CONFIG_BT_MESH_COMP_PAGE_1=y
+
+CONFIG_SETTINGS=y

tests/bluetooth/tester/overlay-mesh.conf

@@ -1,5 +1,4 @@
 CONFIG_BT_MESH=y
-CONFIG_BT_MESH_V1d1=y
 CONFIG_BT_MESH_RELAY=y
 CONFIG_BT_MESH_PB_ADV=y
 CONFIG_BT_MESH_PB_GATT=y
@@ -9,44 +8,18 @@ CONFIG_BT_MESH_GATT_PROXY=y
 CONFIG_BT_MESH_LABEL_COUNT=2
 CONFIG_BT_MESH_SUBNET_COUNT=2
 CONFIG_BT_MESH_MODEL_GROUP_COUNT=2
-CONFIG_BT_MESH_OP_AGG_CLI=y
-CONFIG_BT_MESH_OP_AGG_SRV=y
-# PTS requires more key slots.
-# First one is implicitly taken by Device Key.
-CONFIG_BT_MESH_MODEL_KEY_COUNT=3
 CONFIG_BT_MESH_APP_KEY_COUNT=4
 CONFIG_BT_MESH_IV_UPDATE_TEST=y
 CONFIG_BT_MESH_CFG_CLI=y
 CONFIG_BT_MESH_HEALTH_CLI=y
-CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
-CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
-CONFIG_BT_MESH_SAR_CFG_SRV=y
-CONFIG_BT_MESH_SAR_CFG_CLI=y
 CONFIG_BT_MESH_FRIEND=y
 CONFIG_BT_MESH_FRIEND_QUEUE_SIZE=32
 CONFIG_BT_MESH_RX_SEG_MAX=13
-CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BT_MESH_TX_SEG_MSG_COUNT=3
 CONFIG_BT_MESH_LPN_POLL_TIMEOUT=100
 CONFIG_BT_MESH_PROVISIONER=y
 CONFIG_BT_MESH_CDB=y
 CONFIG_BT_MESH_CDB_NODE_COUNT=3
 CONFIG_BT_MESH_PROV_OOB_PUBLIC_KEY=y
 CONFIG_BT_MESH_MSG_CACHE_SIZE=10
 CONFIG_BT_MESH_PROXY_CLIENT=y
-CONFIG_BT_MESH_PROVISIONER=y
-CONFIG_BT_MESH_RPR_SRV=y
-CONFIG_BT_MESH_RPR_CLI=y
-CONFIG_BT_MESH_RPR_AD_TYPES_MAX=2
-CONFIG_BT_MESH_BLOB_CLI=y
-CONFIG_BT_MESH_DFU_CLI=y
-CONFIG_BT_MESH_BLOB_SRV=y
-CONFIG_BT_MESH_DFU_SRV=y
-CONFIG_BT_MESH_DFD_SRV=y
-CONFIG_BT_MESH_DFU_SLOT_CNT=2
-CONFIG_BT_MESH_PRIV_BEACONS=y
-CONFIG_BT_MESH_PRIV_BEACON_SRV=y
-CONFIG_BT_MESH_PRIV_BEACON_CLI=y
-CONFIG_BT_MESH_MODEL_EXTENSIONS=y
-CONFIG_BT_MESH_COMP_PAGE_1=y
-
-CONFIG_SETTINGS=y

tests/bluetooth/tester/testcase.yaml

@@ -25,3 +25,12 @@ tests:
     extra_args: OVERLAY_CONFIG="overlay-mesh.conf"
     tags: bluetooth
     harness: bluetooth
+  bluetooth.general.tester_mesh_v1d1:
+    build_only: true
+    platform_allow:
+      - qemu_x86
+      - native_posix
+      - nrf52840dk_nrf52840
+    extra_args: OVERLAY_CONFIG="overlay-mesh.conf;overlay-mesh-v1d1.conf"
+    tags: bluetooth
+    harness: bluetooth