Skip to content

Commit 9cae99c

Browse files
ardo-nordickartben
ardo-nordic
authored and
kartben
committed
tests: bsim: bluetooth: host: streamline conf files
Currently different test cases within the same folder are using largely the same config files with only subtle variations. It is better instead to have a base config file with general configuration, aided by overlay files for specific cases. Signed-off-by: Artur Dobrynin <artur.dobrynin@nordicsemi.no>
1 parent e0f74cf commit 9cae99c

File tree

10 files changed

+2
-158
lines changed

10 files changed

+2
-158
lines changed

‎tests/bsim/bluetooth/host/adv/periodic/prj_coded.conf

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_DEVICE_NAME="test_per_adv"
3-
CONFIG_BT_PERIPHERAL=y
4-
CONFIG_BT_CENTRAL=y
5-
CONFIG_BT_SMP=y
6-
CONFIG_BT_PRIVACY=y
7-
8-
CONFIG_BT_EXT_ADV=y
9-
CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
10-
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
11-
CONFIG_BT_CTLR_ADV_AUX_SET=2
12-
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
131
CONFIG_BT_CTLR_PHY_CODED=y
14-
CONFIG_BT_PER_ADV=y
15-
CONFIG_BT_PER_ADV_SYNC=y

‎tests/bsim/bluetooth/host/adv/periodic/prj_long_data.conf

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_DEVICE_NAME="test_per_adv"
3-
CONFIG_BT_PERIPHERAL=y
4-
CONFIG_BT_CENTRAL=y
5-
CONFIG_BT_SMP=y
6-
CONFIG_BT_PRIVACY=y
7-
8-
CONFIG_BT_EXT_ADV=y
9-
CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
10-
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
11-
CONFIG_BT_CTLR_ADV_AUX_SET=2
121
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
132
CONFIG_BT_CTLR_ADV_AUX_PDU_BACK2BACK=y
143
CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
15-
CONFIG_BT_PER_ADV=y
16-
CONFIG_BT_PER_ADV_SYNC=y
17-
CONFIG_BT_PER_ADV_SYNC_BUF_SIZE=1650
184

5+
CONFIG_BT_PER_ADV_SYNC_BUF_SIZE=1650
196
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
207
CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
218
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650

‎tests/bsim/bluetooth/host/att/eatt/prj_collision.conf renamed to ‎tests/bsim/bluetooth/host/att/eatt/prj.conf

File renamed without changes.

‎tests/bsim/bluetooth/host/att/eatt/prj_autoconnect.conf

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_CENTRAL=y
3-
CONFIG_BT_PERIPHERAL=y
4-
CONFIG_BT_SMP=y
5-
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
6-
CONFIG_BT_DEVICE_NAME="EATT test"
7-
CONFIG_BT_EATT=y
8-
CONFIG_BT_L2CAP_ECRED=y
9-
CONFIG_BT_EATT_MAX=5
10-
CONFIG_BT_MAX_CONN=1
11-
12-
CONFIG_BT_TESTING=y
13-
CONFIG_LOG=y
14-
CONFIG_ASSERT=y
1+
CONFIG_BT_EATT_AUTO_CONNECT=y
152

163
CONFIG_BT_L2CAP_TX_MTU=200
174
CONFIG_BT_L2CAP_LOG_LEVEL_DBG=y

‎tests/bsim/bluetooth/host/att/eatt/prj_lowres.conf

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_CENTRAL=y
3-
CONFIG_BT_PERIPHERAL=y
4-
CONFIG_BT_SMP=y
5-
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
6-
CONFIG_BT_DEVICE_NAME="EATT test"
7-
CONFIG_BT_EATT=y
8-
CONFIG_BT_L2CAP_ECRED=y
91
CONFIG_BT_EATT_MAX=2
10-
CONFIG_BT_MAX_CONN=1
11-
CONFIG_BT_EATT_AUTO_CONNECT=n
12-
13-
CONFIG_BT_TESTING=y
14-
CONFIG_LOG=y
15-
CONFIG_ASSERT=y
162

173
CONFIG_BT_L2CAP_LOG_LEVEL_DBG=y

‎tests/bsim/bluetooth/host/att/eatt/prj_multiple_conn.conf

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_CENTRAL=y
3-
CONFIG_BT_PERIPHERAL=y
4-
CONFIG_BT_SMP=y
5-
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
6-
CONFIG_BT_DEVICE_NAME="EATT test"
7-
CONFIG_BT_EATT=y
8-
CONFIG_BT_L2CAP_ECRED=y
9-
CONFIG_BT_EATT_MAX=5
101
CONFIG_BT_MAX_CONN=2
11-
CONFIG_BT_EATT_AUTO_CONNECT=n
12-
13-
CONFIG_BT_TESTING=y
14-
CONFIG_LOG=y
15-
CONFIG_ASSERT=y

‎tests/bsim/bluetooth/host/gatt/settings/prj_2.conf

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_PERIPHERAL=y
3-
CONFIG_BT_CENTRAL=y
4-
CONFIG_BT_DEVICE_NAME="GATT settings"
5-
6-
CONFIG_LOG=y
7-
CONFIG_ASSERT=y
8-
CONFIG_BT_TESTING=y
9-
10-
CONFIG_BT_AUTO_PHY_UPDATE=n
11-
CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
12-
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
13-
14-
CONFIG_BT_SMP=y
15-
CONFIG_BT_GATT_CLIENT=y
16-
CONFIG_BT_GATT_DYNAMIC_DB=y
17-
CONFIG_BT_GATT_CACHING=y
18-
19-
CONFIG_SETTINGS=y
20-
CONFIG_SETTINGS_CUSTOM=y
21-
CONFIG_BT_SETTINGS=y
22-
23-
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
24-
CONFIG_BT_GATT_AUTO_RESUBSCRIBE=n
25-
261
CONFIG_BT_PRIVACY=y

‎tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_expired.conf

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_PERIPHERAL=y
3-
CONFIG_BT_CENTRAL=y
4-
CONFIG_BT_SMP=y
5-
CONFIG_ASSERT=y
6-
7-
CONFIG_BT_EXT_ADV=y
8-
CONFIG_BT_PRIVACY=y
9-
CONFIG_BT_RPA_TIMEOUT=10
101
CONFIG_BT_EXT_ADV_MAX_ADV_SET=4
11-
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
122
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=4
13-
CONFIG_BT_ID_MAX=3
14-
15-
CONFIG_FLASH=y
16-
CONFIG_FLASH_MAP=y
17-
CONFIG_NVS=y
18-
CONFIG_SETTINGS=y
19-
CONFIG_BT_SETTINGS=y
20-
# Increased stack due to settings API usage
21-
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
223

234
# Enable the RPA sharing mode
245
CONFIG_BT_RPA_SHARING=y

‎tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_sharing.conf

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,2 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_PERIPHERAL=y
3-
CONFIG_BT_CENTRAL=y
4-
CONFIG_BT_SMP=y
5-
CONFIG_ASSERT=y
6-
7-
CONFIG_BT_EXT_ADV=y
8-
CONFIG_BT_PRIVACY=y
9-
CONFIG_BT_RPA_TIMEOUT=10
10-
CONFIG_BT_EXT_ADV_MAX_ADV_SET=3
11-
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
12-
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=3
13-
CONFIG_BT_ID_MAX=3
14-
15-
CONFIG_FLASH=y
16-
CONFIG_FLASH_MAP=y
17-
CONFIG_NVS=y
18-
CONFIG_SETTINGS=y
19-
CONFIG_BT_SETTINGS=y
20-
# Increased stack due to settings API usage
21-
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
22-
231
# Enable the RPA sharing mode
242
CONFIG_BT_RPA_SHARING=y

‎tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,3 @@
1-
CONFIG_BT=y
2-
CONFIG_BT_CENTRAL=y
3-
CONFIG_BT_PERIPHERAL=y
4-
CONFIG_BT_DEVICE_NAME="CCC Update Test"
5-
6-
CONFIG_LOG=y
7-
8-
CONFIG_BT_EXT_ADV=y
9-
CONFIG_BT_MAX_CONN=3
10-
CONFIG_BT_GATT_CLIENT=y
11-
121
# Disable CCC lazy loading, this cause the CCC config to not be cleared at
132
# disconnection
143
CONFIG_BT_SETTINGS_CCC_LAZY_LOADING=n
15-
16-
CONFIG_BT_SMP=y
17-
18-
CONFIG_SETTINGS=y
19-
CONFIG_BT_SETTINGS=y
20-
CONFIG_FLASH=y
21-
CONFIG_NVS=y
22-
CONFIG_FLASH_MAP=y
23-
CONFIG_SETTINGS_NVS=y
24-
25-
CONFIG_ASSERT=y

0 commit comments

Comments
 (0)