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 <trnn@demant.com>
2023-02-07 11:26:27 +01:00 · 2023-02-07 11:26:27 +01:00 · c57095740f
commit c57095740f
parent 67a6fe9312
12 changed files with 102 additions and 10 deletions
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_dut.conf
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_dut.conf
@ -29,3 +29,16 @@ CONFIG_BT_CTLR_DTM_HCI=y
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=60

 CONFIG_BT_LL_SW_LLCP_LEGACY=y
+
+# Enable extended advertising
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_CTLR_ADV_EXT=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
+CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
+CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
+CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_CTLR_RX_BUFFERS=9
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_dut_llcp.conf
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_dut_llcp.conf
@ -32,3 +32,16 @@ CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
 # LLCP Refactored controller does not support Advanced Scheduling yet
 CONFIG_BT_CTLR_SCHED_ADVANCED=n
+
+# Enable extended advertising
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_CTLR_ADV_EXT=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
+CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
+CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
+CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_CTLR_RX_BUFFERS=9
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_tst.conf
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_tst.conf
@ -29,3 +29,16 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=60
 CONFIG_BT_LL_SW_LLCP_LEGACY=y
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
 CONFIG_BT_CTLR_PARAM_CHECK=n
+
+# Enable extended advertising
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_CTLR_ADV_EXT=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
+CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
+CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
+CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_CTLR_RX_BUFFERS=9
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_tst_llcp.conf
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_tst_llcp.conf
@ -30,3 +30,16 @@ CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
 # LLCP Refactored controller does not support Advanced Scheduling yet
 CONFIG_BT_CTLR_SCHED_ADVANCED=n
+
+# Enable extended advertising
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_CTLR_ADV_EXT=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
+CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
+CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
+CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_CTLR_RX_BUFFERS=9
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/_controller_tests_inner.sh
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/_controller_tests_inner.sh
@ -94,24 +94,24 @@ fi

 cd ${EDTT_PATH}

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

 cd ${BSIM_OUT_PATH}/bin

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

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

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

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

 for PROCESS_ID in $PROCESS_IDS; do
  wait $PROCESS_ID || let "EXIT_CODE=$?"
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/hci.llcp.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/hci.llcp.test_list
@ -21,11 +21,13 @@ HCI/CM/BV-02-C # [Handling LE Read Local Resolvable Address Command]
 HCI/CM/BV-03-C # [Handling LE Read PHY Command]
 HCI/DDI/BI-02-C
 HCI/DDI/BV-03-C
+HCI/DDI/BI-63-C
+HCI/DDI/BI-65-C
 HCI/DDI/BV-04-C
 HCI/DSU/BV-02-C
 HCI/DSU/BV-03-C # [Reset Command received in Slave Role]
 HCI/DSU/BV-04-C
 HCI/DSU/BV-05-C
 HCI/DSU/BV-06-C # [Reset Command received in Master Role]
-HCI/GEV/BV-01-C
+#HCI/GEV/BV-01-C # Test fails since it assumes extended advertising is not supported
 HCI/HFC/BV-04-C # [Events enabled by LE Set Event Mask Command]
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/hci.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/hci.test_list
@ -22,10 +22,12 @@ HCI/CM/BV-03-C
 HCI/DDI/BI-02-C
 HCI/DDI/BV-03-C
 HCI/DDI/BV-04-C
+HCI/DDI/BI-63-C
+HCI/DDI/BI-65-C
 HCI/DSU/BV-02-C
 HCI/DSU/BV-03-C
 HCI/DSU/BV-04-C
 HCI/DSU/BV-05-C
 HCI/DSU/BV-06-C
-HCI/GEV/BV-01-C
+#HCI/GEV/BV-01-C # Test fails since it assumes extended advertising is not supported
 HCI/HFC/BV-04-C
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.llcp.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.llcp.test_list
@ -3,8 +3,13 @@

 LL/CON/ADV/BV-01-C
 LL/CON/ADV/BV-04-C
+LL/CON/ADV/BV-05-C
+LL/CON/ADV/BV-06-C
 LL/CON/ADV/BV-09-C
 LL/CON/ADV/BV-10-C
+#LL/CON/ADV/BV-12-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/54531
+LL/CON/ADV/BV-14-C
+#LL/CON/ADV/BV-15-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/54531
 LL/CON/INI/BV-01-C
 LL/CON/INI/BV-02-C
 LL/CON/INI/BV-06-C
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.test_list
@ -3,8 +3,13 @@

 LL/CON/ADV/BV-01-C
 LL/CON/ADV/BV-04-C
+LL/CON/ADV/BV-05-C
+LL/CON/ADV/BV-06-C
 LL/CON/ADV/BV-09-C
 LL/CON/ADV/BV-10-C
+LL/CON/ADV/BV-12-C
+LL/CON/ADV/BV-14-C
+LL/CON/ADV/BV-15-C
 LL/CON/INI/BV-01-C
 LL/CON/INI/BV-02-C
 LL/CON/INI/BV-06-C
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set2.llcp.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set2.llcp.test_list
@ -10,6 +10,8 @@ LL/CON/PER/BV-42-C
 #LL/CON/PER/BV-78-C # Needs testcase implementation update
 #LL/CON/PER/BV-80-C # Needs testcase implementation update
 #LL/CON/PER/BV-81-C # Needs testcase implementation update
+LL/DDI/ADV/BI-05-C
+LL/DDI/ADV/BI-06-C
 LL/DDI/ADV/BV-01-C
 LL/DDI/ADV/BV-02-C
 LL/DDI/ADV/BV-03-C
@ -26,6 +28,13 @@ LL/DDI/ADV/BV-17-C
 LL/DDI/ADV/BV-18-C
 LL/DDI/ADV/BV-19-C
 LL/DDI/ADV/BV-20-C
+LL/DDI/ADV/BV-22-C
+#LL/DDI/ADV/BV-27-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+LL/DDI/ADV/BV-28-C
+#LL/DDI/ADV/BV-45-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+#LL/DDI/ADV/BV-47-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+#LL/DDI/ADV/BV-49-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+#LL/DDI/ADV/BV-52-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
 LL/DDI/SCN/BV-01-C
 LL/DDI/SCN/BV-02-C
 LL/DDI/SCN/BV-03-C
@ -60,3 +69,7 @@ LL/SEC/ADV/BV-17-C
 LL/SEC/ADV/BV-18-C
 LL/SEC/ADV/BV-20-C
 LL/SEC/SCN/BV-01-C
+LL/TIM/ADV/BV-03-C
+LL/TIM/ADV/BV-04-C
+LL/TIM/ADV/BV-05-C
+LL/TIM/ADV/BV-07-C
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set2.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set2.test_list
@ -10,6 +10,8 @@ LL/CON/PER/BV-42-C
 #LL/CON/PER/BV-78-C # Needs testcase implementation update
 #LL/CON/PER/BV-80-C # Needs testcase implementation update
 #LL/CON/PER/BV-81-C # Needs testcase implementation update
+LL/DDI/ADV/BI-05-C
+LL/DDI/ADV/BI-06-C
 LL/DDI/ADV/BV-01-C
 LL/DDI/ADV/BV-02-C
 LL/DDI/ADV/BV-03-C
@ -26,6 +28,13 @@ LL/DDI/ADV/BV-17-C
 LL/DDI/ADV/BV-18-C
 LL/DDI/ADV/BV-19-C
 LL/DDI/ADV/BV-20-C
+LL/DDI/ADV/BV-22-C
+#LL/DDI/ADV/BV-27-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+LL/DDI/ADV/BV-28-C
+#LL/DDI/ADV/BV-45-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+#LL/DDI/ADV/BV-47-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+#LL/DDI/ADV/BV-49-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
+#LL/DDI/ADV/BV-52-C # Fails due to https://github.com/zephyrproject-rtos/zephyr/issues/53137
 LL/DDI/SCN/BV-01-C
 LL/DDI/SCN/BV-02-C
 LL/DDI/SCN/BV-03-C
@ -60,3 +69,7 @@ LL/SEC/ADV/BV-17-C
 LL/SEC/ADV/BV-18-C
 LL/SEC/ADV/BV-20-C
 LL/SEC/SCN/BV-01-C
+LL/TIM/ADV/BV-03-C
+LL/TIM/ADV/BV-04-C
+LL/TIM/ADV/BV-05-C
+LL/TIM/ADV/BV-07-C
--- a/west.yml
+++ b/west.yml
@ -37,7 +37,7 @@ manifest:
      groups:
        - hal
    - name: edtt
-      revision: 000fb87261beaf33f80a8868e73857bd62edc668
+      revision: 8ef968c1471769af61ba3e5befb6b119b22a7afe
      path: tools/edtt
      groups:
        - tools