tests: bsim: bluetooth: host: use twister to compile tests

Bluetooth host bsim tests are compiled with shell scripts, but it is possible to use twister, which supports compilation (but not running at the moment). Copiling with twister provides cleaner interface and more flexible configuration. Signed-off-by: Artur Dobrynin <[email protected]>
zephyrproject-rtos · Nov 27, 2024 · 7fcc7ef · 7fcc7ef
1 parent 2879607
commit 7fcc7ef
Show file tree

Hide file tree

Showing 239 changed files with 1,298 additions and 944 deletions.
diff --git a/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh b/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh
@@ -13,5 +13,6 @@ export BOARD="${BOARD:-nrf5340bsim/nrf5340/cpunet}"
 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 ${ZEPHYR_BASE}/tests/bsim/bluetooth/ll/compile.sh
+${ZEPHYR_BASE}/tests/bsim/bluetooth/host/compile.sh
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/chain/testcase.yaml b/tests/bsim/bluetooth/host/adv/chain/testcase.yaml
@@ -0,0 +1,11 @@
+tests:
+  bluetooth.host.adv.chain:
+    build_only: true
+    tags:
+      - bluetooth
+    platform_allow:
+      - nrf52_bsim
+      - nrf5340bsim/nrf5340/cpunet
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_chain_prj_conf
diff --git a/tests/bsim/bluetooth/host/adv/chain/tests_scripts/adv_chain.sh b/tests/bsim/bluetooth/host/adv/chain/tests_scripts/adv_chain.sh
@@ -11,6 +11,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_chain_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=adv
 

diff --git a/tests/bsim/bluetooth/host/adv/compile.sh b/tests/bsim/bluetooth/host/adv/compile.sh
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/compile.sh b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/compile.sh
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/run_tests.sh b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/run_tests.sh
@@ -6,6 +6,10 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 simulation_id="$(guess_test_long_name)"
 verbosity_level=2
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 test_exe="bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf"
 
 cd ${BSIM_OUT_PATH}/bin

diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/testcase.yaml b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/testcase.yaml
@@ -0,0 +1,10 @@
+tests:
+  bluetooth.host.adv.encrypted.css_sample_data:
+    build_only: true
+    tags:
+      - bluetooth
+    platform_allow:
+      - nrf52_bsim
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_encrypted_css_sample_data_prj_conf
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh
@@ -9,6 +9,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
 

diff --git a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/testcase.yaml b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/testcase.yaml
@@ -0,0 +1,10 @@
+tests:
+  bluetooth.host.adv.encrypted.ead_sample:
+    build_only: true
+    tags:
+      - bluetooth
+    platform_allow:
+      - nrf52_bsim
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf
diff --git a/tests/bsim/bluetooth/host/adv/extended/testcase.yaml b/tests/bsim/bluetooth/host/adv/extended/testcase.yaml
@@ -0,0 +1,20 @@
+common:
+  build_only: true
+  tags:
+    - bluetooth
+  platform_allow:
+    - nrf52_bsim
+    - nrf5340bsim/nrf5340/cpunet
+  harness: bsim
+
+tests:
+  bluetooth.host.adv.extended.advertiser:
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
+    extra_args:
+      CONF_FILE=prj_advertiser.conf
+  bluetooth.host.adv.extended.scanner:
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
+    extra_args:
+      CONF_FILE=prj_scanner.conf
diff --git a/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv.sh b/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv.sh
@@ -14,6 +14,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=ext_adv_advertiser -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv_conn.sh b/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv_conn.sh
@@ -16,6 +16,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=ext_adv_conn_advertiser -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv_conn_x5.sh b/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv_conn_x5.sh
@@ -16,6 +16,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=ext_adv_conn_advertiser_x5 -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/long_ad/compile.sh b/tests/bsim/bluetooth/host/adv/long_ad/compile.sh
diff --git a/tests/bsim/bluetooth/host/adv/long_ad/test_scripts/run.sh b/tests/bsim/bluetooth/host/adv/long_ad/test_scripts/run.sh
@@ -14,6 +14,10 @@ verbosity_level=2
 
 SIM_LEN_US=$((2 * 1000 * 1000))
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 test_exe="${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_${test_name}_prj_conf"
 
 cd ${BSIM_OUT_PATH}/bin

diff --git a/tests/bsim/bluetooth/host/adv/long_ad/testcase.yaml b/tests/bsim/bluetooth/host/adv/long_ad/testcase.yaml
@@ -0,0 +1,10 @@
+tests:
+  bluetooth.host.adv.long_ad:
+    build_only: true
+    tags:
+      - bluetooth
+    platform_allow:
+      - nrf52_bsim
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_long_ad_prj_conf
diff --git a/tests/bsim/bluetooth/host/adv/periodic/prj_coded.conf b/tests/bsim/bluetooth/host/adv/periodic/prj_coded.conf
@@ -1,15 +1 @@
-CONFIG_BT=y
-CONFIG_BT_DEVICE_NAME="test_per_adv"
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_SMP=y
-CONFIG_BT_PRIVACY=y
-
-CONFIG_BT_EXT_ADV=y
-CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
-CONFIG_BT_CTLR_ADVANCED_FEATURES=y
-CONFIG_BT_CTLR_ADV_AUX_SET=2
-CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
 CONFIG_BT_CTLR_PHY_CODED=y
-CONFIG_BT_PER_ADV=y
-CONFIG_BT_PER_ADV_SYNC=y
diff --git a/tests/bsim/bluetooth/host/adv/periodic/prj_long_data.conf b/tests/bsim/bluetooth/host/adv/periodic/prj_long_data.conf
@@ -1,21 +1,8 @@
-CONFIG_BT=y
-CONFIG_BT_DEVICE_NAME="test_per_adv"
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_SMP=y
-CONFIG_BT_PRIVACY=y
-
-CONFIG_BT_EXT_ADV=y
-CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
-CONFIG_BT_CTLR_ADVANCED_FEATURES=y
-CONFIG_BT_CTLR_ADV_AUX_SET=2
 CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
 CONFIG_BT_CTLR_ADV_AUX_PDU_BACK2BACK=y
 CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
-CONFIG_BT_PER_ADV=y
-CONFIG_BT_PER_ADV_SYNC=y
-CONFIG_BT_PER_ADV_SYNC_BUF_SIZE=1650
 
+CONFIG_BT_PER_ADV_SYNC_BUF_SIZE=1650
 CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
 CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
diff --git a/tests/bsim/bluetooth/host/adv/periodic/testcase.yaml b/tests/bsim/bluetooth/host/adv/periodic/testcase.yaml
@@ -0,0 +1,23 @@
+common:
+  build_only: true
+  tags:
+    - bluetooth
+  platform_allow:
+    - nrf52_bsim
+    - nrf5340bsim/nrf5340/cpunet
+  harness: bsim
+
+tests:
+  bluetooth.host.adv.periodic:
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+  bluetooth.host.adv.periodic.coded:
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf
+    extra_args:
+      EXTRA_CONF_FILE=prj_coded.conf
+  bluetooth.host.adv.periodic.long_data:
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf
+    extra_args:
+      EXTRA_CONF_FILE=prj_long_data.conf
diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh
@@ -12,6 +12,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=per_adv_advertiser -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning.sh
@@ -12,6 +12,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=per_adv_advertiser -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning_coded.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning_coded.sh
@@ -13,6 +13,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=per_adv_advertiser_coded_phy -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh
@@ -12,6 +12,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=per_adv_conn_advertiser -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh
@@ -12,6 +12,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=per_adv_conn_privacy_advertiser -rs=23

diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh
@@ -12,6 +12,10 @@ verbosity_level=2
 
 cd ${BSIM_OUT_PATH}/bin
 
+if [ "${BOARD_TS}" = "nrf52_bsim" ]; then
+  BOARD_TS="${BOARD_TS}_native"
+fi
+
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=per_adv_long_data_advertiser -rs=23

diff --git a/tests/bsim/bluetooth/host/att/compile.sh b/tests/bsim/bluetooth/host/att/compile.sh
diff --git a/...luetooth/host/att/eatt/prj_collision.conf → tests/bsim/bluetooth/host/att/eatt/prj.conf b/...luetooth/host/att/eatt/prj_collision.conf → tests/bsim/bluetooth/host/att/eatt/prj.conf
@@ -1,3 +1,7 @@
+CONFIG_BT_TESTING=y
+CONFIG_LOG=y
+CONFIG_ASSERT=y
+
 CONFIG_BT=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
@@ -9,7 +13,3 @@ CONFIG_BT_L2CAP_ECRED=y
 CONFIG_BT_EATT_MAX=5
 CONFIG_BT_MAX_CONN=1
 CONFIG_BT_EATT_AUTO_CONNECT=n
-
-CONFIG_BT_TESTING=y
-CONFIG_LOG=y
-CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/att/eatt/prj_autoconnect.conf b/tests/bsim/bluetooth/host/att/eatt/prj_autoconnect.conf
@@ -1,17 +1,4 @@
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_SMP=y
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-CONFIG_BT_DEVICE_NAME="EATT test"
-CONFIG_BT_EATT=y
-CONFIG_BT_L2CAP_ECRED=y
-CONFIG_BT_EATT_MAX=5
-CONFIG_BT_MAX_CONN=1
-
-CONFIG_BT_TESTING=y
-CONFIG_LOG=y
-CONFIG_ASSERT=y
+CONFIG_BT_EATT_AUTO_CONNECT=y
 
 CONFIG_BT_L2CAP_TX_MTU=200
 CONFIG_BT_L2CAP_LOG_LEVEL_DBG=y