Skip to content

Commit c570957

Browse files
Tronilcarlescufi
Tronil
authored and
carlescufi
committed
Tests: Bluetooth: Update EDTT and add new test cases
Updates EDTT to newest version and adds the new test cases Update _controller_tests_inner.sh to support using packet inspection and the new low-level device feature in EDTT Build configs for the BSim test apps updated to support extended advertising Signed-off-by: Troels Nilsson <[email protected]>
1 parent 67a6fe9 commit c570957

File tree

12 files changed

+102
-10
lines changed

12 files changed

+102
-10
lines changed

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_dut.conf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,16 @@ CONFIG_BT_CTLR_DTM_HCI=y
2929
CONFIG_BT_CTLR_DATA_LENGTH_MAX=60
3030

3131
CONFIG_BT_LL_SW_LLCP_LEGACY=y
32+
33+
# Enable extended advertising
34+
CONFIG_BT_EXT_ADV=y
35+
CONFIG_BT_CTLR_ADV_EXT=y
36+
CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
37+
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
38+
CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
39+
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
40+
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
41+
CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
42+
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
43+
CONFIG_BT_BUF_EVT_RX_COUNT=16
44+
CONFIG_BT_CTLR_RX_BUFFERS=9

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_dut_llcp.conf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,16 @@ CONFIG_BT_LL_SW_LLCP=y
3232
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
3333
# LLCP Refactored controller does not support Advanced Scheduling yet
3434
CONFIG_BT_CTLR_SCHED_ADVANCED=n
35+
36+
# Enable extended advertising
37+
CONFIG_BT_EXT_ADV=y
38+
CONFIG_BT_CTLR_ADV_EXT=y
39+
CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
40+
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
41+
CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
42+
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
43+
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
44+
CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
45+
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
46+
CONFIG_BT_BUF_EVT_RX_COUNT=16
47+
CONFIG_BT_CTLR_RX_BUFFERS=9

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_tst.conf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,16 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=60
2929
CONFIG_BT_LL_SW_LLCP_LEGACY=y
3030
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
3131
CONFIG_BT_CTLR_PARAM_CHECK=n
32+
33+
# Enable extended advertising
34+
CONFIG_BT_EXT_ADV=y
35+
CONFIG_BT_CTLR_ADV_EXT=y
36+
CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
37+
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
38+
CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
39+
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
40+
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
41+
CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
42+
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
43+
CONFIG_BT_BUF_EVT_RX_COUNT=16
44+
CONFIG_BT_CTLR_RX_BUFFERS=9

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_tst_llcp.conf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,16 @@ CONFIG_BT_LL_SW_LLCP=y
3030
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
3131
# LLCP Refactored controller does not support Advanced Scheduling yet
3232
CONFIG_BT_CTLR_SCHED_ADVANCED=n
33+
34+
# Enable extended advertising
35+
CONFIG_BT_EXT_ADV=y
36+
CONFIG_BT_CTLR_ADV_EXT=y
37+
CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
38+
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
39+
CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
40+
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
41+
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
42+
CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
43+
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
44+
CONFIG_BT_BUF_EVT_RX_COUNT=16
45+
CONFIG_BT_CTLR_RX_BUFFERS=9

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/_controller_tests_inner.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,24 +94,24 @@ fi
9494

9595
cd ${EDTT_PATH}
9696

97-
Execute ./src/edttool.py -s=${SIMULATION_ID} -d=0 --transport bsim \
98-
-T $TEST_MODULE -C $TEST_FILE -v=${VERBOSITY_LEVEL_EDTT} -S
97+
Execute ./src/edttool.py -s=${SIMULATION_ID} -d=2 --transport bsim \
98+
-T $TEST_MODULE -C $TEST_FILE -v=${VERBOSITY_LEVEL_EDTT} -S -l --low-level-device-nbr=3
9999

100100
cd ${BSIM_OUT_PATH}/bin
101101

102-
Execute ./bs_device_EDTT_bridge -s=${SIMULATION_ID} -d=0 -AutoTerminate \
103-
-RxWait=2.5e3 -D=2 -dev0=1 -dev1=2 -v=${VERBOSITY_LEVEL_BRIDGE}
102+
Execute ./bs_device_EDTT_bridge -s=${SIMULATION_ID} -d=2 -AutoTerminate \
103+
-RxWait=2.5e3 -D=2 -dev0=0 -dev1=1 -v=${VERBOSITY_LEVEL_BRIDGE}
104104

105105
Execute \
106106
${RR_ARGS_1} ./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_${PRJ_CONF_1}\
107-
-s=${SIMULATION_ID} -d=1 -v=${VERBOSITY_LEVEL_DEV1} -RealEncryption=1
107+
-s=${SIMULATION_ID} -d=0 -v=${VERBOSITY_LEVEL_DEV1} -RealEncryption=1
108108

109109
Execute \
110110
${RR_ARGS_2} ./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_${PRJ_CONF_2}\
111-
-s=${SIMULATION_ID} -d=2 -v=${VERBOSITY_LEVEL_DEV2} -RealEncryption=1
111+
-s=${SIMULATION_ID} -d=1 -v=${VERBOSITY_LEVEL_DEV2} -RealEncryption=1
112112

113113
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL_PHY} -s=${SIMULATION_ID} \
114-
-D=3 -sim_length=3600e6 $@
114+
-D=4 -sim_length=3600e6 -dump_imm $@
115115

116116
for PROCESS_ID in $PROCESS_IDS; do
117117
wait $PROCESS_ID || let "EXIT_CODE=$?"

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/hci.llcp.test_list‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ HCI/CM/BV-02-C # [Handling LE Read Local Resolvable Address Command]
2121
HCI/CM/BV-03-C # [Handling LE Read PHY Command]
2222
HCI/DDI/BI-02-C
2323
HCI/DDI/BV-03-C
24+
HCI/DDI/BI-63-C
25+
HCI/DDI/BI-65-C
2426
HCI/DDI/BV-04-C
2527
HCI/DSU/BV-02-C
2628
HCI/DSU/BV-03-C # [Reset Command received in Slave Role]
2729
HCI/DSU/BV-04-C
2830
HCI/DSU/BV-05-C
2931
HCI/DSU/BV-06-C # [Reset Command received in Master Role]
30-
HCI/GEV/BV-01-C
32+
#HCI/GEV/BV-01-C # Test fails since it assumes extended advertising is not supported
3133
HCI/HFC/BV-04-C # [Events enabled by LE Set Event Mask Command]

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/hci.test_list‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ HCI/CM/BV-03-C
2222
HCI/DDI/BI-02-C
2323
HCI/DDI/BV-03-C
2424
HCI/DDI/BV-04-C
25+
HCI/DDI/BI-63-C
26+
HCI/DDI/BI-65-C
2527
HCI/DSU/BV-02-C
2628
HCI/DSU/BV-03-C
2729
HCI/DSU/BV-04-C
2830
HCI/DSU/BV-05-C
2931
HCI/DSU/BV-06-C
30-
HCI/GEV/BV-01-C
32+
#HCI/GEV/BV-01-C # Test fails since it assumes extended advertising is not supported
3133
HCI/HFC/BV-04-C

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.llcp.test_list‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33

44
LL/CON/ADV/BV-01-C
55
LL/CON/ADV/BV-04-C
6+
LL/CON/ADV/BV-05-C
7+
LL/CON/ADV/BV-06-C
68
LL/CON/ADV/BV-09-C
79
LL/CON/ADV/BV-10-C
10+
#LL/CON/ADV/BV-12-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/54531
11+
LL/CON/ADV/BV-14-C
12+
#LL/CON/ADV/BV-15-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/54531
813
LL/CON/INI/BV-01-C
914
LL/CON/INI/BV-02-C
1015
LL/CON/INI/BV-06-C

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.test_list‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33

44
LL/CON/ADV/BV-01-C
55
LL/CON/ADV/BV-04-C
6+
LL/CON/ADV/BV-05-C
7+
LL/CON/ADV/BV-06-C
68
LL/CON/ADV/BV-09-C
79
LL/CON/ADV/BV-10-C
10+
LL/CON/ADV/BV-12-C
11+
LL/CON/ADV/BV-14-C
12+
LL/CON/ADV/BV-15-C
813
LL/CON/INI/BV-01-C
914
LL/CON/INI/BV-02-C
1015
LL/CON/INI/BV-06-C

‎tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set2.llcp.test_list‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ LL/CON/PER/BV-42-C
1010
#LL/CON/PER/BV-78-C # Needs testcase implementation update
1111
#LL/CON/PER/BV-80-C # Needs testcase implementation update
1212
#LL/CON/PER/BV-81-C # Needs testcase implementation update
13+
LL/DDI/ADV/BI-05-C
14+
LL/DDI/ADV/BI-06-C
1315
LL/DDI/ADV/BV-01-C
1416
LL/DDI/ADV/BV-02-C
1517
LL/DDI/ADV/BV-03-C
@@ -26,6 +28,13 @@ LL/DDI/ADV/BV-17-C
2628
LL/DDI/ADV/BV-18-C
2729
LL/DDI/ADV/BV-19-C
2830
LL/DDI/ADV/BV-20-C
31+
LL/DDI/ADV/BV-22-C
32+
#LL/DDI/ADV/BV-27-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
33+
LL/DDI/ADV/BV-28-C
34+
#LL/DDI/ADV/BV-45-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
35+
#LL/DDI/ADV/BV-47-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
36+
#LL/DDI/ADV/BV-49-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
37+
#LL/DDI/ADV/BV-52-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
2938
LL/DDI/SCN/BV-01-C
3039
LL/DDI/SCN/BV-02-C
3140
LL/DDI/SCN/BV-03-C
@@ -60,3 +69,7 @@ LL/SEC/ADV/BV-17-C
6069
LL/SEC/ADV/BV-18-C
6170
LL/SEC/ADV/BV-20-C
6271
LL/SEC/SCN/BV-01-C
72+
LL/TIM/ADV/BV-03-C
73+
LL/TIM/ADV/BV-04-C
74+
LL/TIM/ADV/BV-05-C
75+
LL/TIM/ADV/BV-07-C

0 commit comments

Comments
 (0)