tests bsim: Change folder structure

Bsim won't be limited anymore to BT tests.
In preparation for adding more tests in network areas
swap the tests/bluetooth/bsim with tests/bsim/bluetooth

There is no other changes in this commit beyond that.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>

.github/workflows/bluetooth-tests.yaml

@@ -6,7 +6,7 @@ on:
       - ".github/workflows/bluetooth-test*.yaml"
       - "west.yml"
       - "subsys/bluetooth/**"
-      - "tests/bluetooth/bsim/**"
+      - "tests/bsim/bluetooth/**"
       - "samples/bluetooth/**"
       - "boards/posix/**"
       - "soc/posix/**"
@@ -76,9 +76,9 @@ jobs:
       - name: Run Bluetooth Tests with BSIM
         run: |
           export ZEPHYR_BASE=${PWD}
-          WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim/compile.sh
+          WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/bluetooth/compile.sh
           RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_test_results_file} \
-          SEARCH_PATH=tests/bluetooth/bsim/ tests/bluetooth/bsim/run_parallel.sh
+          SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/bluetooth/run_parallel.sh
 
       - name: Upload Test Results
         if: always()

CODEOWNERS

@@ -830,9 +830,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/                    @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/bsim/bluetooth/                    @alwa-nordic @jhedberg @Vudentz @wopu-ot
+/tests/bsim/bluetooth/audio/              @jhedberg @Vudentz @wopu-ot @Thalley
+/tests/bsim/bluetooth/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

MAINTAINERS.yml

@@ -210,7 +210,7 @@ Bluetooth:
     - samples/bluetooth/mesh/
     - subsys/bluetooth/audio/
     - include/zephyr/bluetooth/audio/
-    - tests/bluetooth/bsim/audio/
+    - tests/bsim/bluetooth/audio/
     - tests/bluetooth/controller/
     - tests/bluetooth/mesh_*/
     - tests/bluetooth/mesh/
@@ -272,7 +272,7 @@ Bluetooth Audio:
   files:
     - subsys/bluetooth/audio/
     - include/zephyr/bluetooth/audio/
-    - tests/bluetooth/bsim/audio/
+    - tests/bsim/bluetooth/audio/
     - tests/bluetooth/shell/audio*
   labels:
     - "area: Bluetooth Audio"

tests/bluetooth/bsim/host/compile.sh

@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Compile all the applications needed by the bsim tests
-
-#set -x #uncomment this line for debugging
-set -ue
-
-: "${BSIM_OUT_PATH:?BSIM_OUT_PATH must be defined}"
-: "${BSIM_COMPONENTS_PATH:?BSIM_COMPONENTS_PATH must be defined}"
-: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root\
- directory}"
-
-WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}"
-BOARD="${BOARD:-nrf52_bsim}"
-BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
-
-mkdir -p ${WORK_DIR}
-
-source ${ZEPHYR_BASE}/tests/bluetooth/bsim/compile.source
-
-app=tests/bluetooth/bsim/host/adv/resume compile
-app=tests/bluetooth/bsim/host/adv/resume conf_file=prj_2.conf compile
-app=tests/bluetooth/bsim/host/adv/chain compile
-app=tests/bluetooth/bsim/host/adv/periodic compile
-app=tests/bluetooth/bsim/host/adv/periodic conf_file=prj_long_data.conf compile
-
-app=tests/bluetooth/bsim/host/att/eatt conf_file=prj_collision.conf compile
-app=tests/bluetooth/bsim/host/att/eatt conf_file=prj_multiple_conn.conf compile
-app=tests/bluetooth/bsim/host/att/eatt conf_file=prj_autoconnect.conf compile
-app=tests/bluetooth/bsim/host/att/eatt_notif conf_file=prj.conf compile
-app=tests/bluetooth/bsim/host/att/mtu_update compile
-
-app=tests/bluetooth/bsim/host/gatt/caching compile
-app=tests/bluetooth/bsim/host/gatt/general compile
-app=tests/bluetooth/bsim/host/gatt/notify compile
-app=tests/bluetooth/bsim/host/gatt/notify_multiple compile
-app=tests/bluetooth/bsim/host/gatt/settings compile
-app=tests/bluetooth/bsim/host/gatt/settings conf_file=prj_2.conf compile
-app=tests/bluetooth/bsim/host/gatt/write compile
-
-app=tests/bluetooth/bsim/host/l2cap/general compile
-app=tests/bluetooth/bsim/host/l2cap/userdata compile
-app=tests/bluetooth/bsim/host/l2cap/stress compile
-
-app=tests/bluetooth/bsim/host/misc/disable compile
-app=tests/bluetooth/bsim/host/misc/multiple_id compile
-
-app=tests/bluetooth/bsim/host/privacy/central compile
-app=tests/bluetooth/bsim/host/privacy/peripheral compile
-app=tests/bluetooth/bsim/host/privacy/device compile
-
-app=tests/bluetooth/bsim/host/security/bond_overwrite_allowed compile
-app=tests/bluetooth/bsim/host/security/bond_overwrite_denied compile
-
-wait_for_background_jobs

tests/bsim/bluetooth/README.txt

@@ -7,9 +7,9 @@ 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/compile.sh
-RESULTS_FILE=${ZEPHYR_BASE}/myresults.xml SEARCH_PATH=tests/bluetooth/bsim tests/bluetooth/bsim/run_parallel.sh
+WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/bluetooth/compile.sh
+RESULTS_FILE=${ZEPHYR_BASE}/myresults.xml SEARCH_PATH=tests/bsim/bluetooth tests/bsim/bluetooth/run_parallel.sh
 
 Or to run only a specific subset, e.g. host advertising tests:
-WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim/host/compile.sh
-RESULTS_FILE=${ZEPHYR_BASE}/myresults.xml SEARCH_PATH=tests/bluetooth/bsim/host/adv tests/bluetooth/bsim/run_parallel.sh
+WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/bluetooth/host/compile.sh
+RESULTS_FILE=${ZEPHYR_BASE}/myresults.xml SEARCH_PATH=tests/bsim/bluetooth/host/adv tests/bsim/bluetooth/run_parallel.sh

tests/bsim/bluetooth/_compile_permutate_kconfigs.sh

@@ -21,7 +21,7 @@ BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
 
 mkdir -p ${WORK_DIR}
 
-source ${ZEPHYR_BASE}/tests/bluetooth/bsim/compile.source
+source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source
 
 
 declare -a list=(
@@ -62,7 +62,7 @@ perm_compile() {
 	echo "Compile with config overlay:"
 	cat $3
     fi
-    local app=tests/bluetooth/bsim/edtt_ble_test_app/hci_test_app
+    local app=tests/bsim/bluetooth/edtt_ble_test_app/hci_test_app
     local conf_file=prj_dut_llcp.conf
     local conf_overlay=$3
     compile

tests/bsim/bluetooth/audio/compile.sh

@@ -18,8 +18,8 @@ BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
 
 mkdir -p ${WORK_DIR}
 
-source ${ZEPHYR_BASE}/tests/bluetooth/bsim/compile.source
+source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source
 
-app=tests/bluetooth/bsim/audio compile
+app=tests/bsim/bluetooth/audio compile
 
 wait_for_background_jobs

tests/bsim/bluetooth/audio/test_scripts/bap_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=bap_scan_delegator \
   -rs=24
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 \
   -testid=bap_broadcast_assistant -rs=46
 
-  Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+  Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh

@@ -27,11 +27,11 @@ printf "\n\n======== Broadcaster test =========\n\n"
 
 SIMULATION_ID="broadcaster"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=broadcast_source -rs=23
 
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=broadcast_source -rs=23
 
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 \
   -testid=broadcast_sink_disconnect -rs=27
 

tests/bsim/bluetooth/audio/test_scripts/bap_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=unicast_client -rs=23
 
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=cap_acceptor_broadcast -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=cap_acceptor_unicast -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_enc \
   -RealEncryption=1 -rs=4 -argstest rank 3
 

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=has -rs=24
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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} \

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=ias -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=mcc -rs=46
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=media_controller_remote_player -rs=46
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=micp_mic_dev -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/audio/test_scripts/tbs.sh

@@ -25,10 +25,10 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=tbs -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/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_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=vcp_vol_rend_standalone -rs=23
 
 # Simulation time should be larger than the WAIT_TIME in common.h
@@ -39,10 +39,10 @@ done
 
 printf "\n\n======== Running VCP Volume Renderer and VCP Volume Controller test =========\n\n"
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=vcp_vol_rend -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_audio_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_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

tests/bsim/bluetooth/compile.sh

@@ -18,11 +18,11 @@ BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
 
 mkdir -p ${WORK_DIR}
 
-source ${ZEPHYR_BASE}/tests/bluetooth/bsim/sh_common.source
+source ${ZEPHYR_BASE}/tests/bsim/bluetooth/sh_common.source
 
-run_in_background ${ZEPHYR_BASE}/tests/bluetooth/bsim/audio/compile.sh
-run_in_background ${ZEPHYR_BASE}/tests/bluetooth/bsim/host/compile.sh
-run_in_background ${ZEPHYR_BASE}/tests/bluetooth/bsim/ll/compile.sh
-run_in_background ${ZEPHYR_BASE}/tests/bluetooth/bsim/mesh/compile.sh
+run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/audio/compile.sh
+run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/compile.sh
+run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/ll/compile.sh
+run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/mesh/compile.sh
 
 wait_for_background_jobs

tests/bsim/bluetooth/compile.source

@@ -1,7 +1,7 @@
 # Copyright 2018 Oticon A/S
 # SPDX-License-Identifier: Apache-2.0
 
-source ${ZEPHYR_BASE}/tests/bluetooth/bsim/sh_common.source
+source ${ZEPHYR_BASE}/tests/bsim/bluetooth/sh_common.source
 
 function print_error_info(){
   echo -e "\033[0;31mFailure building ${app} ${conf_file} for ${BOARD}\033[0m\n\

tests/bsim/bluetooth/host/adv/chain/tests_scripts/adv_chain.sh

@@ -24,10 +24,10 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_chain_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_adv_chain_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=adv
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_chain_prj_conf\
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_adv_chain_prj_conf\
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=scan
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \

tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh

@@ -24,11 +24,11 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \
   -testid=per_adv_advertiser -rs=23
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
   -testid=per_adv_syncer -rs=6
 

tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh

@@ -24,11 +24,11 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_conf \
+Execute ./bs_${BOARD}_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
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
   -testid=per_adv_conn_syncer -rs=6
 

tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh

@@ -24,11 +24,11 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_conf \
+Execute ./bs_${BOARD}_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
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
   -testid=per_adv_conn_privacy_syncer -rs=6
 

tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh

@@ -24,11 +24,11 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_long_data_conf \
+Execute ./bs_${BOARD}_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
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_adv_periodic_prj_long_data_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
   -testid=per_adv_long_data_syncer -rs=6
 

tests/bsim/bluetooth/host/adv/resume/test_scripts/_env.sh

@@ -9,5 +9,5 @@ bash_source_dir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
 test_name="$(basename "$(realpath "$bash_source_dir/..")")"
 bsim_bin="${BSIM_OUT_PATH}/bin"
 BOARD="${BOARD:-nrf52_bsim}"
-test_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_adv_resume_prj_conf"
-test_2_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_adv_resume_prj_2_conf"
+test_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_adv_resume_prj_conf"
+test_2_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_adv_resume_prj_2_conf"

tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh

@@ -22,10 +22,10 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_autoconnect_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_autoconnect
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_autoconnect_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_autoconnect
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \

tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh

@@ -22,10 +22,10 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_collision_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_collision_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_collision_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_collision_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \

tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh

@@ -22,10 +22,10 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_multiple_conn_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_multiple_conn_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \

tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh

@@ -22,10 +22,10 @@ BOARD="${BOARD:-nrf52_bsim}"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_autoconnect_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_reconfigure
 
-Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_prj_autoconnect_conf \
+Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_reconfigure
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \