tests: Bluetooth: restructure bsim_bt directory

This commit separates each test by layer level. Obviously the tests will run the whole stack, but they should be separated by which component/layer they intend on testing. Signed-off-by: Jonathan Rico <jonathan.rico@nordicsemi.no>
zephyrproject-rtos · Feb 23, 2023 · 2a9eda2 · 2a9eda2
1 parent cdae0bb
commit 2a9eda2
Show file tree

Hide file tree

Showing 472 changed files with 234 additions and 224 deletions.
diff --git a/.github/workflows/bluetooth-tests.yaml b/.github/workflows/bluetooth-tests.yaml
@@ -6,7 +6,7 @@ on:
       - ".github/workflows/bluetooth-test*.yaml"
       - "west.yml"
       - "subsys/bluetooth/**"
-      - "tests/bluetooth/bsim_bt/**"
+      - "tests/bluetooth/bsim/**"
       - "boards/posix/**"
       - "soc/posix/**"
       - "arch/posix/**"
@@ -75,9 +75,9 @@ jobs:
       - name: Run Bluetooth Tests with BSIM
         run: |
           export ZEPHYR_BASE=${PWD}
-          WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim_bt/compile.sh
+          WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim/compile.sh
           RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_test_results_file} \
-          SEARCH_PATH=tests/bluetooth/bsim_bt/ tests/bluetooth/bsim_bt/run_parallel.sh
+          SEARCH_PATH=tests/bluetooth/bsim/ tests/bluetooth/bsim/run_parallel.sh
 
       - name: Upload Test Results
         if: always()

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -823,9 +823,9 @@ scripts/build/gen_image_info.py           @tejlmand
 /tests/boards/native_posix/               @aescolar @daor-oti
 /tests/bluetooth/                         @alwa-nordic @jhedberg @Vudentz @sjanc
 /tests/bluetooth/controller/              @cvinayak @thoh-ot @kruithofa @erbr-ot @sjanc @ppryga
-/tests/bluetooth/bsim_bt/                 @alwa-nordic @jhedberg @Vudentz @wopu-ot
-/tests/bluetooth/bsim_bt/bsim_test_audio/ @jhedberg @Vudentz @wopu-ot @Thalley
-/tests/bluetooth/bsim_bt/bsim_test_mesh/  @jhedberg @Vudentz @wopu-ot @PavelVPV
+/tests/bluetooth/bsim/                    @alwa-nordic @jhedberg @Vudentz @wopu-ot
+/tests/bluetooth/bsim/audio/              @jhedberg @Vudentz @wopu-ot @Thalley
+/tests/bluetooth/bsim/mesh/               @jhedberg @Vudentz @wopu-ot @PavelVPV
 /tests/bluetooth/mesh_shell/              @jhedberg @Vudentz @sjanc @PavelVPV
 /tests/bluetooth/tester/                  @alwa-nordic @jhedberg @Vudentz @sjanc
 /tests/posix/                             @cfriedt

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
@@ -210,7 +210,7 @@ Bluetooth:
     - samples/bluetooth/mesh/
     - subsys/bluetooth/audio/
     - include/zephyr/bluetooth/audio/
-    - tests/bluetooth/bsim_bt/bsim_test_audio/
+    - tests/bluetooth/bsim/audio/
     - tests/bluetooth/controller/
     - tests/bluetooth/mesh_*/
     - tests/bluetooth/mesh/
@@ -271,7 +271,7 @@ Bluetooth Audio:
   files:
     - subsys/bluetooth/audio/
     - include/zephyr/bluetooth/audio/
-    - tests/bluetooth/bsim_bt/bsim_test_audio/
+    - tests/bluetooth/bsim/audio/
     - tests/bluetooth/shell/audio*
   labels:
     - "area: Bluetooth Audio"

diff --git a/tests/bluetooth/bsim_bt/README.txt → tests/bluetooth/bsim/README.txt b/tests/bluetooth/bsim_bt/README.txt → tests/bluetooth/bsim/README.txt
@@ -7,5 +7,8 @@ the needed images and execute these tests in batch.
 You can also run them manually if desired, but be sure to call them setting
 the variables they expect. For example, from Zephyr's root folder, you can run:
 
-WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim_bt/compile.sh
-RESULTS_FILE=${ZEPHYR_BASE}/myresults.xml SEARCH_PATH=tests/bluetooth/bsim_bt/bsim_test_app/tests_scripts tests/bluetooth/bsim_bt/run_parallel.sh
+WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim/compile.sh
+RESULTS_FILE=${ZEPHYR_BASE}/myresults.xml SEARCH_PATH=tests/bluetooth/bsim tests/bluetooth/bsim/run_parallel.sh
+
+Or to run only a specific subset, e.g. host advertising tests:
+RESULTS_FILE=${ZEPHYR_BASE}/myresults.xml SEARCH_PATH=tests/bluetooth/bsim/host/adv tests/bluetooth/bsim/run_parallel.sh
diff --git a/...th/bsim_bt/_compile_permutate_kconfigs.sh → ...tooth/bsim/_compile_permutate_kconfigs.sh b/...th/bsim_bt/_compile_permutate_kconfigs.sh → ...tooth/bsim/_compile_permutate_kconfigs.sh
@@ -21,7 +21,7 @@ BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
 
 mkdir -p ${WORK_DIR}
 
-source ${ZEPHYR_BASE}/tests/bluetooth/bsim_bt/compile.source
+source ${ZEPHYR_BASE}/tests/bluetooth/bsim/compile.source
 
 
 declare -a list=(
@@ -62,7 +62,7 @@ perm_compile() {
 	echo "Compile with config overlay:"
 	cat $3
     fi
-    local app=tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app
+    local app=tests/bluetooth/bsim/ll/edtt/hci_test_app
     local conf_file=prj_dut.conf
     local conf_overlay=$3
     compile

diff --git a/...th/bsim_bt/bsim_test_audio/CMakeLists.txt → tests/bluetooth/bsim/audio/CMakeLists.txt b/...th/bsim_bt/bsim_test_audio/CMakeLists.txt → tests/bluetooth/bsim/audio/CMakeLists.txt
diff --git a/...bluetooth/bsim_bt/bsim_test_audio/Kconfig → tests/bluetooth/bsim/audio/Kconfig b/...bluetooth/bsim_bt/bsim_test_audio/Kconfig → tests/bluetooth/bsim/audio/Kconfig
diff --git a/...luetooth/bsim_bt/bsim_test_app/README.txt → tests/bluetooth/bsim/audio/README.txt b/...luetooth/bsim_bt/bsim_test_app/README.txt → tests/bluetooth/bsim/audio/README.txt
diff --git a/...luetooth/bsim_bt/bsim_test_audio/prj.conf → tests/bluetooth/bsim/audio/prj.conf b/...luetooth/bsim_bt/bsim_test_audio/prj.conf → tests/bluetooth/bsim/audio/prj.conf
diff --git a/..._audio/src/bap_broadcast_assistant_test.c → .../audio/src/bap_broadcast_assistant_test.c b/..._audio/src/bap_broadcast_assistant_test.c → .../audio/src/bap_broadcast_assistant_test.c
diff --git a/..._test_audio/src/bap_scan_delegator_test.c → .../bsim/audio/src/bap_scan_delegator_test.c b/..._test_audio/src/bap_scan_delegator_test.c → .../bsim/audio/src/bap_scan_delegator_test.c
diff --git a/...im_test_audio/src/bass_broadcaster_test.c → ...th/bsim/audio/src/bass_broadcaster_test.c b/...im_test_audio/src/bass_broadcaster_test.c → ...th/bsim/audio/src/bass_broadcaster_test.c
diff --git a/...bsim_test_audio/src/broadcast_sink_test.c → ...ooth/bsim/audio/src/broadcast_sink_test.c b/...bsim_test_audio/src/broadcast_sink_test.c → ...ooth/bsim/audio/src/broadcast_sink_test.c
diff --git a/...im_test_audio/src/broadcast_source_test.c → ...th/bsim/audio/src/broadcast_source_test.c b/...im_test_audio/src/broadcast_source_test.c → ...th/bsim/audio/src/broadcast_source_test.c
diff --git a/...t/bsim_test_audio/src/cap_acceptor_test.c → ...etooth/bsim/audio/src/cap_acceptor_test.c b/...t/bsim_test_audio/src/cap_acceptor_test.c → ...etooth/bsim/audio/src/cap_acceptor_test.c
diff --git a/.../bsim_test_audio/src/cap_initiator_test.c → ...tooth/bsim/audio/src/cap_initiator_test.c b/.../bsim_test_audio/src/cap_initiator_test.c → ...tooth/bsim/audio/src/cap_initiator_test.c
diff --git a/...ooth/bsim_bt/bsim_test_audio/src/common.c → tests/bluetooth/bsim/audio/src/common.c b/...ooth/bsim_bt/bsim_test_audio/src/common.c → tests/bluetooth/bsim/audio/src/common.c
diff --git a/...ooth/bsim_bt/bsim_test_audio/src/common.h → tests/bluetooth/bsim/audio/src/common.h b/...ooth/bsim_bt/bsim_test_audio/src/common.h → tests/bluetooth/bsim/audio/src/common.h
diff --git a/...est_audio/src/csip_set_coordinator_test.c → ...sim/audio/src/csip_set_coordinator_test.c b/...est_audio/src/csip_set_coordinator_test.c → ...sim/audio/src/csip_set_coordinator_test.c
diff --git a/...sim_test_audio/src/csip_set_member_test.c → ...oth/bsim/audio/src/csip_set_member_test.c b/...sim_test_audio/src/csip_set_member_test.c → ...oth/bsim/audio/src/csip_set_member_test.c
diff --git a/..._bt/bsim_test_audio/src/has_client_test.c → ...luetooth/bsim/audio/src/has_client_test.c b/..._bt/bsim_test_audio/src/has_client_test.c → ...luetooth/bsim/audio/src/has_client_test.c
diff --git a/...th/bsim_bt/bsim_test_audio/src/has_test.c → tests/bluetooth/bsim/audio/src/has_test.c b/...th/bsim_bt/bsim_test_audio/src/has_test.c → tests/bluetooth/bsim/audio/src/has_test.c
diff --git a/..._bt/bsim_test_audio/src/ias_client_test.c → ...luetooth/bsim/audio/src/ias_client_test.c b/..._bt/bsim_test_audio/src/ias_client_test.c → ...luetooth/bsim/audio/src/ias_client_test.c
diff --git a/...th/bsim_bt/bsim_test_audio/src/ias_test.c → tests/bluetooth/bsim/audio/src/ias_test.c b/...th/bsim_bt/bsim_test_audio/src/ias_test.c → tests/bluetooth/bsim/audio/src/ias_test.c
diff --git a/...etooth/bsim_bt/bsim_test_audio/src/main.c → tests/bluetooth/bsim/audio/src/main.c b/...etooth/bsim_bt/bsim_test_audio/src/main.c → tests/bluetooth/bsim/audio/src/main.c
diff --git a/...th/bsim_bt/bsim_test_audio/src/mcc_test.c → tests/bluetooth/bsim/audio/src/mcc_test.c b/...th/bsim_bt/bsim_test_audio/src/mcc_test.c → tests/bluetooth/bsim/audio/src/mcc_test.c
diff --git a/...th/bsim_bt/bsim_test_audio/src/mcs_test.c → tests/bluetooth/bsim/audio/src/mcs_test.c b/...th/bsim_bt/bsim_test_audio/src/mcs_test.c → tests/bluetooth/bsim/audio/src/mcs_test.c
diff --git a/...im_test_audio/src/media_controller_test.c → ...th/bsim/audio/src/media_controller_test.c b/...im_test_audio/src/media_controller_test.c → ...th/bsim/audio/src/media_controller_test.c
diff --git a/.../bsim_test_audio/src/micp_mic_ctlr_test.c → ...tooth/bsim/audio/src/micp_mic_ctlr_test.c b/.../bsim_test_audio/src/micp_mic_ctlr_test.c → ...tooth/bsim/audio/src/micp_mic_ctlr_test.c
diff --git a/...t/bsim_test_audio/src/micp_mic_dev_test.c → ...etooth/bsim/audio/src/micp_mic_dev_test.c b/...t/bsim_test_audio/src/micp_mic_dev_test.c → ...etooth/bsim/audio/src/micp_mic_dev_test.c
diff --git a/..._bt/bsim_test_audio/src/tbs_client_test.c → ...luetooth/bsim/audio/src/tbs_client_test.c b/..._bt/bsim_test_audio/src/tbs_client_test.c → ...luetooth/bsim/audio/src/tbs_client_test.c
diff --git a/...th/bsim_bt/bsim_test_audio/src/tbs_test.c → tests/bluetooth/bsim/audio/src/tbs_test.c b/...th/bsim_bt/bsim_test_audio/src/tbs_test.c → tests/bluetooth/bsim/audio/src/tbs_test.c
diff --git a/...bsim_test_audio/src/unicast_client_test.c → ...ooth/bsim/audio/src/unicast_client_test.c b/...bsim_test_audio/src/unicast_client_test.c → ...ooth/bsim/audio/src/unicast_client_test.c
diff --git a/...m_bt/bsim_test_audio/src/unicast_common.c → ...bluetooth/bsim/audio/src/unicast_common.c b/...m_bt/bsim_test_audio/src/unicast_common.c → ...bluetooth/bsim/audio/src/unicast_common.c
diff --git a/...m_bt/bsim_test_audio/src/unicast_common.h → ...bluetooth/bsim/audio/src/unicast_common.h b/...m_bt/bsim_test_audio/src/unicast_common.h → ...bluetooth/bsim/audio/src/unicast_common.h
diff --git a/...bsim_test_audio/src/unicast_server_test.c → ...ooth/bsim/audio/src/unicast_server_test.c b/...bsim_test_audio/src/unicast_server_test.c → ...ooth/bsim/audio/src/unicast_server_test.c
diff --git a/...t/bsim_test_audio/src/vcp_vol_ctlr_test.c → ...etooth/bsim/audio/src/vcp_vol_ctlr_test.c b/...t/bsim_test_audio/src/vcp_vol_ctlr_test.c → ...etooth/bsim/audio/src/vcp_vol_ctlr_test.c
diff --git a/...t/bsim_test_audio/src/vcp_vol_rend_test.c → ...etooth/bsim/audio/src/vcp_vol_rend_test.c b/...t/bsim_test_audio/src/vcp_vol_rend_test.c → ...etooth/bsim/audio/src/vcp_vol_rend_test.c
diff --git a/...m_bt/bsim_test_audio/test_scripts/_cap.sh → ...bluetooth/bsim/audio/test_scripts/_cap.sh b/...m_bt/bsim_test_audio/test_scripts/_cap.sh → ...bluetooth/bsim/audio/test_scripts/_cap.sh
diff --git a/...m_bt/bsim_test_audio/test_scripts/bass.sh → ...bluetooth/bsim/audio/test_scripts/bass.sh b/...m_bt/bsim_test_audio/test_scripts/bass.sh → ...bluetooth/bsim/audio/test_scripts/bass.sh
@@ -26,15 +26,15 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running BASS and BASS client test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=bap_scan_delegator \
   -rs=24
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 \
   -testid=bap_broadcast_assistant -rs=46
 
-  Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+  Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=bass_broadcaster -rs=69
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...est_audio/test_scripts/broadcast_audio.sh → ...sim/audio/test_scripts/broadcast_audio.sh b/...est_audio/test_scripts/broadcast_audio.sh → ...sim/audio/test_scripts/broadcast_audio.sh
@@ -27,11 +27,11 @@ printf "\n\n======== Broadcaster test =========\n\n"
 
 SIMULATION_ID="broadcaster"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=broadcast_source -rs=23
 
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=broadcast_sink -rs=27
 
 # Simulation time should be larger than the WAIT_TIME in common.h
@@ -46,11 +46,11 @@ printf "\n\n======== Broadcaster sink disconnect test =========\n\n"
 
 SIMULATION_ID="broadcaster_sink_disconnect"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=broadcast_source -rs=23
 
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 \
   -testid=broadcast_sink_disconnect -rs=27
 

diff --git a/..._test_audio/test_scripts/cap_broadcast.sh → .../bsim/audio/test_scripts/cap_broadcast.sh b/..._test_audio/test_scripts/cap_broadcast.sh → .../bsim/audio/test_scripts/cap_broadcast.sh
@@ -26,10 +26,10 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running CAP broadcast test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=cap_acceptor_broadcast -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=cap_initiator_broadcast -rs=46
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...im_test_audio/test_scripts/cap_unicast.sh → ...th/bsim/audio/test_scripts/cap_unicast.sh b/...im_test_audio/test_scripts/cap_unicast.sh → ...th/bsim/audio/test_scripts/cap_unicast.sh
@@ -26,10 +26,10 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running CAP unicast test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=cap_acceptor_unicast -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=cap_initiator_unicast -rs=46
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...m_bt/bsim_test_audio/test_scripts/csip.sh → ...bluetooth/bsim/audio/test_scripts/csip.sh b/...m_bt/bsim_test_audio/test_scripts/csip.sh → ...bluetooth/bsim/audio/test_scripts/csip.sh
@@ -31,19 +31,19 @@ printf "\n\n======== Running normal test ========\n\n"
 
 SIMULATION_ID="csip"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
   -RealEncryption=1 -rs=1
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
   -RealEncryption=1 -rs=2 -argstest rank 1
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
   -RealEncryption=1 -rs=3 -argstest rank 2
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
   -RealEncryption=1 -rs=4 -argstest rank 3
 
@@ -62,19 +62,19 @@ PROCESS_IDS="";
 SIMULATION_ID="csip_forced_release"
 
 printf "\n\n======== Running test with forced release of lock ========\n\n"
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
   -RealEncryption=1 -rs=1
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
   -RealEncryption=1 -rs=2 -argstest rank 1
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
   -RealEncryption=1 -rs=3 -argstest rank 2
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_release \
   -RealEncryption=1 -rs=4 -argstest rank 3
 
@@ -91,19 +91,19 @@ done
 SIMULATION_ID="csip_sirk_encrypted"
 
 printf "\n\n======== Running test with SIRK encrypted ========\n\n"
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
   -RealEncryption=1 -rs=1
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_enc \
   -RealEncryption=1 -rs=2 -argstest rank 1
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member_enc \
   -RealEncryption=1 -rs=3 -argstest rank 2
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_enc \
   -RealEncryption=1 -rs=4 -argstest rank 3
 

diff --git a/...im_bt/bsim_test_audio/test_scripts/has.sh → .../bluetooth/bsim/audio/test_scripts/has.sh b/...im_bt/bsim_test_audio/test_scripts/has.sh → .../bluetooth/bsim/audio/test_scripts/has.sh
@@ -26,10 +26,10 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running HAS main (API) test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=has -rs=24
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=has_client -rs=46
 
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \

diff --git a/...im_bt/bsim_test_audio/test_scripts/ias.sh → .../bluetooth/bsim/audio/test_scripts/ias.sh b/...im_bt/bsim_test_audio/test_scripts/ias.sh → .../bluetooth/bsim/audio/test_scripts/ias.sh
@@ -26,10 +26,10 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running IAS main (API) test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=ias -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=ias_client -rs=6
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...t/bsim_test_audio/test_scripts/mcs_mcc.sh → ...etooth/bsim/audio/test_scripts/mcs_mcc.sh b/...t/bsim_test_audio/test_scripts/mcs_mcc.sh → ...etooth/bsim/audio/test_scripts/mcs_mcc.sh
@@ -26,10 +26,10 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running MCS  and MCC test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=mcc -rs=46
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=mcs -rs=23
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...st_audio/test_scripts/media_controller.sh → ...im/audio/test_scripts/media_controller.sh b/...st_audio/test_scripts/media_controller.sh → ...im/audio/test_scripts/media_controller.sh
@@ -26,7 +26,7 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running media controller local_player test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=media_controller_local_player -rs=23
 
 # Simulation time should be larger than the WAIT_TIME in common.h
@@ -39,10 +39,10 @@ done
 
 printf "\n\n======== Running media controller remote_player test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=media_controller_remote_player -rs=46
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=media_controller_server -rs=23
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...m_bt/bsim_test_audio/test_scripts/micp.sh → ...bluetooth/bsim/audio/test_scripts/micp.sh b/...m_bt/bsim_test_audio/test_scripts/micp.sh → ...bluetooth/bsim/audio/test_scripts/micp.sh
@@ -26,7 +26,7 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n==== Running MICP Microphone Device Only (API) test ====n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=micp_mic_dev_only -rs=23
 
 # Simulation time should be larger than the WAIT_TIME in common.h
@@ -39,10 +39,10 @@ done
 
 printf "\n\n==== Running MICP Microphone Device and MICP Microphone Controller test ====n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=micp_mic_dev -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=micp_mic_ctlr -rs=46
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...im_bt/bsim_test_audio/test_scripts/tbs.sh → .../bluetooth/bsim/audio/test_scripts/tbs.sh b/...im_bt/bsim_test_audio/test_scripts/tbs.sh → .../bluetooth/bsim/audio/test_scripts/tbs.sh
@@ -25,10 +25,10 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=tbs -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=tbs_client -rs=6
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/..._test_audio/test_scripts/unicast_audio.sh → .../bsim/audio/test_scripts/unicast_audio.sh b/..._test_audio/test_scripts/unicast_audio.sh → .../bsim/audio/test_scripts/unicast_audio.sh
@@ -26,11 +26,11 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Unicast Audio test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=unicast_client -rs=23
 
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=unicast_server -rs=27
 
 # Simulation time should be larger than the WAIT_TIME in common.h

diff --git a/...im_bt/bsim_test_audio/test_scripts/vcp.sh → .../bluetooth/bsim/audio/test_scripts/vcp.sh b/...im_bt/bsim_test_audio/test_scripts/vcp.sh → .../bluetooth/bsim/audio/test_scripts/vcp.sh
@@ -26,7 +26,7 @@ cd ${BSIM_OUT_PATH}/bin
 
 printf "\n\n======== Running VCP Volume Renderer standalone (API) test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0
   -testid=vcp_vol_rend_standalone -rs=23
 
@@ -40,10 +40,10 @@ done
 
 printf "\n\n======== Running VCP Volume Renderer and VCP Volume Controller test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=vcp_vol_rend -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=vcp_vol_ctlr -rs=46
 
 # Simulation time should be larger than the WAIT_TIME in common.h