Skip to content

Commit 273cf46

Browse files
cvinayakcarlescufi
authored andcommitted
tests: Bluetooth: bsim: Use separate DUT and TST EDTT builds
Use separate DUT and TST builds in EDTT HCI tests so that the tester can send Data Length Requests with txOctets and maxTxTime as required by the test specification. TST build has HCI parameter checks disabled. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent 5cb3721 commit 273cf46

File tree

5 files changed

+40
-8
lines changed

5 files changed

+40
-8
lines changed

tests/bluetooth/bsim_bt/compile.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ app=tests/bluetooth/bsim_bt/bsim_test_multiple compile
6363
app=tests/bluetooth/bsim_bt/bsim_test_advx compile
6464
app=tests/bluetooth/bsim_bt/bsim_test_iso compile
6565
app=tests/bluetooth/bsim_bt/bsim_test_audio compile
66-
app=tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app compile
66+
app=tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app \
67+
conf_file=prj_dut.conf compile
68+
app=tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app \
69+
conf_file=prj_tst.conf compile
6770
app=tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app compile
6871
app=tests/bluetooth/bsim_bt/bsim_test_mesh compile
6972
app=tests/bluetooth/bsim_bt/bsim_test_mesh conf_file=prj_low_lat.conf compile

tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj.conf renamed to tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_dut.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@
33
CONFIG_BT=y
44
CONFIG_BT_HCI_RAW=y
55
CONFIG_BT_PERIPHERAL=y
6+
CONFIG_BT_BROADCASTER=y
67
CONFIG_BT_CENTRAL=y
8+
CONFIG_BT_OBSERVER=y
79
CONFIG_BT_DEBUG_LOG=y
810
CONFIG_BT_ECC=y
911
CONFIG_BT_TINYCRYPT_ECC=y
1012

13+
CONFIG_BT_BUF_ACL_RX_SIZE=60
14+
CONFIG_BT_BUF_ACL_TX_SIZE=60
15+
1116
##
1217
## Enabling BT_CTRL_DTM_HCI requires BT_LL_SW which requires BT_CTRL
1318
##
@@ -19,8 +24,4 @@ CONFIG_BT_CTLR_LE_ENC=y
1924
CONFIG_BT_CTLR_PRIVACY=y
2025
CONFIG_BT_CTLR_FILTER_ACCEPT_LIST=y
2126
CONFIG_BT_CTLR_DTM_HCI=y
22-
CONFIG_BT_BUF_ACL_TX_SIZE=60
23-
CONFIG_BT_BUF_ACL_RX_SIZE=60
2427
CONFIG_BT_CTLR_DATA_LENGTH_MAX=60
25-
26-
CONFIG_PM=y
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
3+
CONFIG_BT=y
4+
CONFIG_BT_HCI_RAW=y
5+
CONFIG_BT_PERIPHERAL=y
6+
CONFIG_BT_CENTRAL=y
7+
CONFIG_BT_DEBUG_LOG=y
8+
CONFIG_BT_ECC=y
9+
CONFIG_BT_TINYCRYPT_ECC=y
10+
11+
CONFIG_BT_BUF_ACL_RX_SIZE=60
12+
CONFIG_BT_BUF_ACL_TX_SIZE=60
13+
14+
##
15+
## Enabling BT_CTRL_DTM_HCI requires BT_LL_SW which requires BT_CTRL
16+
##
17+
CONFIG_BT_CTLR=y
18+
19+
CONFIG_BT_LL_SW_SPLIT=y
20+
CONFIG_BT_CTLR_CRYPTO=y
21+
CONFIG_BT_CTLR_LE_ENC=y
22+
CONFIG_BT_CTLR_PRIVACY=y
23+
CONFIG_BT_CTLR_FILTER_ACCEPT_LIST=y
24+
CONFIG_BT_CTLR_DTM_HCI=y
25+
CONFIG_BT_CTLR_DATA_LENGTH_MAX=60
26+
27+
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
28+
CONFIG_BT_CTLR_PARAM_CHECK=n

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ Execute ./bs_device_EDTT_bridge -s=${SIMULATION_ID} -d=0 -AutoTerminate \
3333
-RxWait=2.5e3 -D=2 -dev0=1 -dev1=2 -v=${VERBOSITY_LEVEL}
3434

3535
Execute \
36-
./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_prj_conf\
36+
./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_prj_dut_conf\
3737
-s=${SIMULATION_ID} -d=1 -v=${VERBOSITY_LEVEL} -RealEncryption=1
3838

3939
Execute \
40-
./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_prj_conf\
40+
./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_prj_tst_conf\
4141
-s=${SIMULATION_ID} -d=2 -v=${VERBOSITY_LEVEL} -RealEncryption=1
4242

4343
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \

tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Execute ./bs_device_EDTT_bridge -s=${SIMULATION_ID} -d=0 -AutoTerminate \
3434
-RxWait=2.5e3 -D=2 -dev0=1 -dev1=2 -v=${VERBOSITY_LEVEL}
3535

3636
Execute \
37-
./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_prj_conf\
37+
./bs_${BOARD}_tests_bluetooth_bsim_bt_edtt_ble_test_app_hci_test_app_prj_tst_conf\
3838
-s=${SIMULATION_ID} -d=1 -v=${VERBOSITY_LEVEL} -RealEncryption=1
3939

4040
Execute \

0 commit comments

Comments
 (0)