From f27c0b490523563d98677e36443e99931567b794 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Fri, 17 Mar 2023 15:29:24 +0100 Subject: [PATCH] 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 --- .github/workflows/bluetooth-tests.yaml | 6 +- CODEOWNERS | 6 +- MAINTAINERS.yml | 4 +- tests/bluetooth/bsim/host/compile.sh | 57 ------------------- .../bsim => bsim/bluetooth}/README.txt | 8 +-- .../bluetooth}/_compile_permutate_kconfigs.sh | 4 +- .../bluetooth}/audio/CMakeLists.txt | 0 .../bsim => bsim/bluetooth}/audio/Kconfig | 0 .../bsim => bsim/bluetooth}/audio/README.txt | 0 .../bsim => bsim/bluetooth}/audio/compile.sh | 4 +- .../bsim => bsim/bluetooth}/audio/prj.conf | 0 .../audio/src/bap_broadcast_assistant_test.c | 0 .../audio/src/bap_scan_delegator_test.c | 0 .../audio/src/bap_unicast_client_test.c | 0 .../bluetooth}/audio/src/bap_unicast_common.c | 0 .../bluetooth}/audio/src/bap_unicast_common.h | 0 .../audio/src/bap_unicast_server_test.c | 0 .../audio/src/bass_broadcaster_test.c | 0 .../audio/src/broadcast_sink_test.c | 0 .../audio/src/broadcast_source_test.c | 0 .../bluetooth}/audio/src/cap_acceptor_test.c | 0 .../bluetooth}/audio/src/cap_initiator_test.c | 0 .../bluetooth}/audio/src/common.c | 0 .../bluetooth}/audio/src/common.h | 0 .../audio/src/csip_set_coordinator_test.c | 0 .../audio/src/csip_set_member_test.c | 0 .../bluetooth}/audio/src/has_client_test.c | 0 .../bluetooth}/audio/src/has_test.c | 0 .../bluetooth}/audio/src/ias_client_test.c | 0 .../bluetooth}/audio/src/ias_test.c | 0 .../bsim => bsim/bluetooth}/audio/src/main.c | 0 .../bluetooth}/audio/src/mcc_test.c | 0 .../bluetooth}/audio/src/mcs_test.c | 0 .../audio/src/media_controller_test.c | 0 .../bluetooth}/audio/src/micp_mic_ctlr_test.c | 0 .../bluetooth}/audio/src/micp_mic_dev_test.c | 0 .../bluetooth}/audio/src/tbs_client_test.c | 0 .../bluetooth}/audio/src/tbs_test.c | 0 .../bluetooth}/audio/src/vcp_vol_ctlr_test.c | 0 .../bluetooth}/audio/src/vcp_vol_rend_test.c | 0 .../bluetooth}/audio/test_scripts/_cap.sh | 0 .../bluetooth}/audio/test_scripts/bap_bass.sh | 6 +- .../audio/test_scripts/bap_broadcast_audio.sh | 8 +-- .../audio/test_scripts/bap_unicast_audio.sh | 4 +- .../audio/test_scripts/cap_broadcast.sh | 4 +- .../audio/test_scripts/cap_unicast.sh | 4 +- .../bluetooth}/audio/test_scripts/csip.sh | 24 ++++---- .../bluetooth}/audio/test_scripts/has.sh | 4 +- .../bluetooth}/audio/test_scripts/ias.sh | 4 +- .../bluetooth}/audio/test_scripts/mcs_mcc.sh | 4 +- .../audio/test_scripts/media_controller.sh | 6 +- .../bluetooth}/audio/test_scripts/micp.sh | 6 +- .../bluetooth}/audio/test_scripts/tbs.sh | 4 +- .../bluetooth}/audio/test_scripts/vcp.sh | 6 +- .../bsim => bsim/bluetooth}/compile.sh | 10 ++-- .../bsim => bsim/bluetooth}/compile.source | 2 +- .../bluetooth}/host/adv/chain/CMakeLists.txt | 0 .../bluetooth}/host/adv/chain/prj.conf | 0 .../bluetooth}/host/adv/chain/src/main.c | 0 .../host/adv/chain/tests_scripts/adv_chain.sh | 4 +- .../host/adv/periodic/CMakeLists.txt | 0 .../bluetooth}/host/adv/periodic/prj.conf | 0 .../host/adv/periodic/prj_long_data.conf | 0 .../bluetooth}/host/adv/periodic/src/common.c | 0 .../bluetooth}/host/adv/periodic/src/common.h | 0 .../bluetooth}/host/adv/periodic/src/main.c | 0 .../adv/periodic/src/per_adv_advertiser.c | 0 .../host/adv/periodic/src/per_adv_syncer.c | 0 .../adv/periodic/tests_scripts/per_adv.sh | 4 +- .../periodic/tests_scripts/per_adv_conn.sh | 4 +- .../tests_scripts/per_adv_conn_privacy.sh | 4 +- .../tests_scripts/per_adv_long_data.sh | 4 +- .../bluetooth}/host/adv/resume/CMakeLists.txt | 0 .../bluetooth}/host/adv/resume/prj.conf | 0 .../bluetooth}/host/adv/resume/prj_2.conf | 0 .../host/adv/resume/src/bs_bt_utils.c | 0 .../host/adv/resume/src/bs_bt_utils.h | 0 .../bluetooth}/host/adv/resume/src/dut.c | 0 .../bluetooth}/host/adv/resume/src/main.c | 0 .../bluetooth}/host/adv/resume/src/tester.c | 0 .../host/adv/resume/test_scripts/_compile.sh | 0 .../host/adv/resume/test_scripts/_env.sh | 4 +- .../adv/resume/test_scripts/run_adv_resume.sh | 0 .../resume/test_scripts/run_adv_resume_2.sh | 0 .../bluetooth}/host/att/eatt/CMakeLists.txt | 0 .../host/att/eatt/prj_autoconnect.conf | 0 .../host/att/eatt/prj_collision.conf | 0 .../host/att/eatt/prj_multiple_conn.conf | 0 .../bluetooth}/host/att/eatt/src/common.c | 0 .../bluetooth}/host/att/eatt/src/common.h | 0 .../bluetooth}/host/att/eatt/src/main.c | 0 .../host/att/eatt/src/main_autoconnect.c | 0 .../host/att/eatt/src/main_collision.c | 0 .../host/att/eatt/src/main_reconfigure.c | 0 .../att/eatt/tests_scripts/autoconnect.sh | 4 +- .../host/att/eatt/tests_scripts/collision.sh | 4 +- .../att/eatt/tests_scripts/multiple_conn.sh | 4 +- .../att/eatt/tests_scripts/reconfigure.sh | 4 +- .../host/att/eatt_notif/CMakeLists.txt | 0 .../bluetooth}/host/att/eatt_notif/prj.conf | 0 .../host/att/eatt_notif/src/client_test.c | 0 .../host/att/eatt_notif/src/common.c | 0 .../host/att/eatt_notif/src/common.h | 0 .../bluetooth}/host/att/eatt_notif/src/main.c | 0 .../host/att/eatt_notif/src/server_test.c | 0 .../att/eatt_notif/test_scripts/eatt_notif.sh | 4 +- .../host/att/mtu_update/CMakeLists.txt | 0 .../bluetooth}/host/att/mtu_update/prj.conf | 0 .../bluetooth}/host/att/mtu_update/src/main.c | 0 .../att/mtu_update/test_scripts/_compile.sh | 4 +- .../host/att/mtu_update/test_scripts/_env.sh | 2 +- .../att/mtu_update/test_scripts/run_test.sh | 0 tests/bsim/bluetooth/host/compile.sh | 57 +++++++++++++++++++ .../host/gatt/caching/CMakeLists.txt | 0 .../bluetooth}/host/gatt/caching/prj.conf | 0 .../bluetooth}/host/gatt/caching/src/common.c | 0 .../bluetooth}/host/gatt/caching/src/common.h | 0 .../host/gatt/caching/src/gatt_client_test.c | 0 .../host/gatt/caching/src/gatt_server_test.c | 0 .../bluetooth}/host/gatt/caching/src/main.c | 0 .../gatt/caching/test_scripts/_run_test.sh | 4 +- .../gatt_caching_db_hash_read_eatt.sh | 0 .../gatt_caching_db_hash_read_no_eatt.sh | 0 .../gatt_caching_out_of_sync_eatt.sh | 0 .../gatt_caching_out_of_sync_no_eatt.sh | 0 .../gatt_caching_retry_reads_eatt.sh | 0 .../gatt_caching_retry_reads_no_eatt.sh | 0 .../host/gatt/general/CMakeLists.txt | 0 .../bluetooth}/host/gatt/general/prj.conf | 0 .../bluetooth}/host/gatt/general/src/common.c | 0 .../bluetooth}/host/gatt/general/src/common.h | 0 .../host/gatt/general/src/gatt_client_test.c | 0 .../host/gatt/general/src/gatt_server_test.c | 0 .../bluetooth}/host/gatt/general/src/main.c | 0 .../host/gatt/general/test_scripts/gatt.sh | 4 +- .../host/gatt/notify/CMakeLists.txt | 0 .../bluetooth}/host/gatt/notify/prj.conf | 0 .../bluetooth}/host/gatt/notify/src/common.c | 0 .../bluetooth}/host/gatt/notify/src/common.h | 0 .../host/gatt/notify/src/gatt_client_test.c | 0 .../host/gatt/notify/src/gatt_server_test.c | 0 .../bluetooth}/host/gatt/notify/src/main.c | 0 .../gatt/notify/test_scripts/_run_test.sh | 4 +- .../gatt_notify_enhanced_enhanced.sh | 0 .../gatt_notify_enhanced_mixed.sh | 0 .../test_scripts/gatt_notify_enhanced_none.sh | 0 .../gatt_notify_enhanced_unenhanced.sh | 0 .../gatt_notify_mixed_enhanced.sh | 0 .../test_scripts/gatt_notify_mixed_mixed.sh | 0 .../test_scripts/gatt_notify_mixed_none.sh | 0 .../gatt_notify_mixed_unenhanced.sh | 0 .../test_scripts/gatt_notify_none_enhanced.sh | 0 .../test_scripts/gatt_notify_none_mixed.sh | 0 .../test_scripts/gatt_notify_none_none.sh | 0 .../gatt_notify_none_unenhanced.sh | 0 .../gatt_notify_unenhanced_enhanced.sh | 0 .../gatt_notify_unenhanced_mixed.sh | 0 .../gatt_notify_unenhanced_none.sh | 0 .../gatt_notify_unenhanced_unenhanced.sh | 0 .../host/gatt/notify_multiple/CMakeLists.txt | 0 .../host/gatt/notify_multiple/prj.conf | 0 .../host/gatt/notify_multiple/src/common.c | 0 .../host/gatt/notify_multiple/src/common.h | 0 .../notify_multiple/src/gatt_client_test.c | 0 .../notify_multiple/src/gatt_server_test.c | 0 .../host/gatt/notify_multiple/src/main.c | 0 .../test_scripts/_notify-debug.sh | 4 +- .../notify_multiple/test_scripts/notify.sh | 4 +- .../host/gatt/settings/CMakeLists.txt | 0 .../bluetooth}/host/gatt/settings/prj.conf | 0 .../bluetooth}/host/gatt/settings/prj_2.conf | 0 .../host/gatt/settings/src/client.c | 0 .../host/gatt/settings/src/gatt_utils.c | 0 .../host/gatt/settings/src/gatt_utils.h | 0 .../bluetooth}/host/gatt/settings/src/main.c | 0 .../bluetooth}/host/gatt/settings/src/main.h | 0 .../host/gatt/settings/src/server.c | 0 .../host/gatt/settings/src/settings.c | 0 .../bluetooth}/host/gatt/settings/src/utils.c | 0 .../bluetooth}/host/gatt/settings/src/utils.h | 0 .../gatt/settings/test_scripts/_compile.sh | 0 .../host/gatt/settings/test_scripts/_env.sh | 4 +- .../test_scripts/run_gatt_settings.sh | 0 .../test_scripts/run_gatt_settings_2.sh | 0 .../bluetooth}/host/gatt/write/CMakeLists.txt | 0 .../bluetooth}/host/gatt/write/prj.conf | 0 .../bluetooth}/host/gatt/write/src/main.c | 0 .../gatt/write/tests_scripts/gatt_write.sh | 4 +- .../host/l2cap/general/CMakeLists.txt | 0 .../bluetooth}/host/l2cap/general/prj.conf | 0 .../host/l2cap/general/src/common.c | 0 .../host/l2cap/general/src/common.h | 0 .../bluetooth}/host/l2cap/general/src/main.c | 0 .../host/l2cap/general/src/main_l2cap_ecred.c | 0 .../host/l2cap/general/tests_scripts/l2cap.sh | 4 +- .../host/l2cap/stress/CMakeLists.txt | 0 .../bluetooth}/host/l2cap/stress/prj.conf | 0 .../bluetooth}/host/l2cap/stress/src/common.c | 0 .../bluetooth}/host/l2cap/stress/src/common.h | 0 .../bluetooth}/host/l2cap/stress/src/main.c | 0 .../host/l2cap/stress/tests_scripts/l2cap.sh | 2 +- .../host/l2cap/userdata/CMakeLists.txt | 0 .../bluetooth}/host/l2cap/userdata/prj.conf | 0 .../host/l2cap/userdata/src/common.c | 0 .../host/l2cap/userdata/src/common.h | 0 .../bluetooth}/host/l2cap/userdata/src/main.c | 0 .../l2cap/userdata/src/main_l2cap_userdata.c | 0 .../l2cap/userdata/tests_scripts/l2cap.sh | 4 +- .../host/misc/disable/CMakeLists.txt | 0 .../bluetooth}/host/misc/disable/prj.conf | 0 .../bluetooth}/host/misc/disable/src/common.c | 0 .../bluetooth}/host/misc/disable/src/common.h | 0 .../host/misc/disable/src/gatt_client_test.c | 0 .../host/misc/disable/src/gatt_server_test.c | 0 .../bluetooth}/host/misc/disable/src/main.c | 0 .../host/misc/disable/src/main_disable.c | 0 .../misc/disable/tests_scripts/disable.sh | 2 +- .../tests_scripts/disable_with_gatt.sh | 4 +- .../host/misc/multiple_id/CMakeLists.txt | 0 .../bluetooth}/host/misc/multiple_id/prj.conf | 0 .../host/misc/multiple_id/src/main.c | 0 .../multiple_id/tests_scripts/multiple.sh | 4 +- .../host/privacy/central/CMakeLists.txt | 0 .../bluetooth}/host/privacy/central/prj.conf | 0 .../host/privacy/central/src/bs_bt_utils.c | 0 .../host/privacy/central/src/bs_bt_utils.h | 0 .../bluetooth}/host/privacy/central/src/dut.c | 0 .../host/privacy/central/src/main.c | 0 .../host/privacy/central/src/tester.c | 0 .../privacy/central/test_scripts/_compile.sh | 0 .../host/privacy/central/test_scripts/_env.sh | 2 +- .../privacy/central/test_scripts/run_test.sh | 0 .../host/privacy/device/CMakeLists.txt | 0 .../bluetooth}/host/privacy/device/README.rst | 0 .../bluetooth}/host/privacy/device/prj.conf | 0 .../device/src/test_undirected_central.c | 0 .../privacy/device/src/test_undirected_main.c | 0 .../device/src/test_undirected_peripheral.c | 0 .../privacy/device/test_scripts/_compile.sh | 0 .../host/privacy/device/test_scripts/_env.sh | 2 +- .../privacy/device/test_scripts/run_tests.sh | 0 .../host/privacy/peripheral/CMakeLists.txt | 0 .../host/privacy/peripheral/prj.conf | 0 .../host/privacy/peripheral/src/bs_bt_utils.c | 0 .../host/privacy/peripheral/src/bs_bt_utils.h | 0 .../host/privacy/peripheral/src/dut.c | 0 .../host/privacy/peripheral/src/main.c | 0 .../host/privacy/peripheral/src/tester.c | 0 .../peripheral/test_scripts/_compile.sh | 0 .../privacy/peripheral/test_scripts/_env.sh | 2 +- .../peripheral/test_scripts/run_test.sh | 0 .../bond_overwrite_allowed/CMakeLists.txt | 0 .../security/bond_overwrite_allowed/prj.conf | 0 .../bond_overwrite_allowed/src/bs_bt_utils.c | 0 .../bond_overwrite_allowed/src/bs_bt_utils.h | 0 .../bond_overwrite_allowed/src/central.c | 0 .../bond_overwrite_allowed/src/main.c | 0 .../bond_overwrite_allowed/src/peripheral.c | 0 .../test_scripts/_compile.sh | 4 +- .../test_scripts/_env.sh | 2 +- .../test_scripts/run_test.sh | 0 .../bond_overwrite_denied/CMakeLists.txt | 0 .../security/bond_overwrite_denied/prj.conf | 0 .../bond_overwrite_denied/src/bs_bt_utils.c | 0 .../bond_overwrite_denied/src/bs_bt_utils.h | 0 .../bond_overwrite_denied/src/central.c | 0 .../security/bond_overwrite_denied/src/main.c | 0 .../bond_overwrite_denied/src/peripheral.c | 0 .../test_scripts/_compile.sh | 4 +- .../test_scripts/_env.sh | 2 +- .../test_scripts/run_test.sh | 0 .../bluetooth}/ll/advx/CMakeLists.txt | 0 .../bsim => bsim/bluetooth}/ll/advx/prj.conf | 0 .../bluetooth}/ll/advx/src/main.c | 0 .../ll/advx/tests_scripts/basic_advx.sh | 4 +- .../bsim => bsim/bluetooth}/ll/compile.sh | 20 +++---- .../bluetooth}/ll/conn/CMakeLists.txt | 0 .../bluetooth}/ll/conn/README.txt | 0 .../bluetooth}/ll/conn/prj_split.conf | 0 .../bluetooth}/ll/conn/prj_split_low_lat.conf | 0 .../bluetooth}/ll/conn/prj_split_privacy.conf | 0 .../bluetooth}/ll/conn/src/main.c | 0 .../bluetooth}/ll/conn/src/test_connect1.c | 0 .../bluetooth}/ll/conn/src/test_connect2.c | 0 .../bluetooth}/ll/conn/src/test_empty.c | 0 .../basic_conn_encrypted_split.sh | 4 +- .../basic_conn_encrypted_split_privacy.sh | 4 +- .../ll/conn/tests_scripts/basic_conn_split.sh | 4 +- .../tests_scripts/basic_conn_split_low_lat.sh | 4 +- .../bluetooth}/ll/edtt/README.txt | 6 +- .../bluetooth}/ll/edtt/common/commands.h | 0 .../bluetooth}/ll/edtt/common/edtt_driver.h | 0 .../ll/edtt/common/edtt_driver_bsim.c | 0 .../ll/edtt/gatt_test_app/CMakeLists.txt | 0 .../ll/edtt/gatt_test_app/prj_llcp.conf | 0 .../edtt/gatt_test_app/src/gatt/gatt_macs.h | 0 .../edtt/gatt_test_app/src/gatt/service_a_1.c | 0 .../edtt/gatt_test_app/src/gatt/service_a_1.h | 0 .../edtt/gatt_test_app/src/gatt/service_a_2.c | 0 .../edtt/gatt_test_app/src/gatt/service_a_2.h | 0 .../edtt/gatt_test_app/src/gatt/service_a_3.c | 0 .../edtt/gatt_test_app/src/gatt/service_a_3.h | 0 .../gatt_test_app/src/gatt/service_b_1_1.c | 0 .../gatt_test_app/src/gatt/service_b_1_1.h | 0 .../gatt_test_app/src/gatt/service_b_1_2.c | 0 .../gatt_test_app/src/gatt/service_b_1_2.h | 0 .../gatt_test_app/src/gatt/service_b_1_3.c | 0 .../gatt_test_app/src/gatt/service_b_1_3.h | 0 .../gatt_test_app/src/gatt/service_b_2_1.c | 0 .../gatt_test_app/src/gatt/service_b_2_1.h | 0 .../gatt_test_app/src/gatt/service_b_2_2.c | 0 .../gatt_test_app/src/gatt/service_b_2_2.h | 0 .../gatt_test_app/src/gatt/service_b_2_3.c | 0 .../gatt_test_app/src/gatt/service_b_2_3.h | 0 .../gatt_test_app/src/gatt/service_b_3_1.c | 0 .../gatt_test_app/src/gatt/service_b_3_1.h | 0 .../gatt_test_app/src/gatt/service_b_3_2.c | 0 .../gatt_test_app/src/gatt/service_b_3_2.h | 0 .../gatt_test_app/src/gatt/service_b_3_3.c | 0 .../gatt_test_app/src/gatt/service_b_3_3.h | 0 .../gatt_test_app/src/gatt/service_b_4_1.c | 0 .../gatt_test_app/src/gatt/service_b_4_1.h | 0 .../gatt_test_app/src/gatt/service_b_4_2.c | 0 .../gatt_test_app/src/gatt/service_b_4_2.h | 0 .../gatt_test_app/src/gatt/service_b_4_3.c | 0 .../gatt_test_app/src/gatt/service_b_4_3.h | 0 .../gatt_test_app/src/gatt/service_b_5_1.c | 0 .../gatt_test_app/src/gatt/service_b_5_1.h | 0 .../gatt_test_app/src/gatt/service_b_5_2.c | 0 .../gatt_test_app/src/gatt/service_b_5_2.h | 0 .../gatt_test_app/src/gatt/service_b_5_3.c | 0 .../gatt_test_app/src/gatt/service_b_5_3.h | 0 .../gatt_test_app/src/gatt/service_c_1_1.c | 0 .../gatt_test_app/src/gatt/service_c_1_1.h | 0 .../gatt_test_app/src/gatt/service_c_1_2.c | 0 .../gatt_test_app/src/gatt/service_c_1_2.h | 0 .../gatt_test_app/src/gatt/service_c_1_3.c | 0 .../gatt_test_app/src/gatt/service_c_1_3.h | 0 .../gatt_test_app/src/gatt/service_c_2_1.c | 0 .../gatt_test_app/src/gatt/service_c_2_1.h | 0 .../gatt_test_app/src/gatt/service_c_2_2.c | 0 .../gatt_test_app/src/gatt/service_c_2_2.h | 0 .../gatt_test_app/src/gatt/service_c_2_3.c | 0 .../gatt_test_app/src/gatt/service_c_2_3.h | 0 .../edtt/gatt_test_app/src/gatt/service_d_1.c | 0 .../edtt/gatt_test_app/src/gatt/service_d_1.h | 0 .../edtt/gatt_test_app/src/gatt/service_d_2.c | 0 .../edtt/gatt_test_app/src/gatt/service_d_2.h | 0 .../edtt/gatt_test_app/src/gatt/service_d_3.c | 0 .../edtt/gatt_test_app/src/gatt/service_d_3.h | 0 .../edtt/gatt_test_app/src/gatt/service_e_2.c | 0 .../edtt/gatt_test_app/src/gatt/service_e_2.h | 0 .../edtt/gatt_test_app/src/gatt/service_e_3.c | 0 .../edtt/gatt_test_app/src/gatt/service_e_3.h | 0 .../edtt/gatt_test_app/src/gatt/service_f_1.c | 0 .../edtt/gatt_test_app/src/gatt/service_f_1.h | 0 .../ll/edtt/gatt_test_app/src/gatt/services.h | 0 .../ll/edtt/gatt_test_app/src/main.c | 0 .../ll/edtt/hci_test_app/CMakeLists.txt | 0 .../ll/edtt/hci_test_app/prj_dut_llcp.conf | 0 .../ll/edtt/hci_test_app/prj_tst_llcp.conf | 0 .../ll/edtt/hci_test_app/src/main.c | 0 .../tests_scripts/_controller_tests_inner.sh | 4 +- .../ll/edtt/tests_scripts/gap.llcp.sh | 0 .../ll/edtt/tests_scripts/gap.llcp.test_list | 0 .../ll/edtt/tests_scripts/gatt.llcp.sh | 4 +- .../ll/edtt/tests_scripts/gatt.llcp.test_list | 0 .../ll/edtt/tests_scripts/hci.llcp.sh | 0 .../ll/edtt/tests_scripts/hci.llcp.test_list | 0 .../ll/edtt/tests_scripts/ll.1.llcp.sh | 0 .../ll/edtt/tests_scripts/ll.2.llcp.sh | 0 .../edtt/tests_scripts/ll.set1.llcp.test_list | 0 .../edtt/tests_scripts/ll.set2.llcp.test_list | 0 .../bluetooth}/ll/iso/CMakeLists.txt | 0 .../bsim => bsim/bluetooth}/ll/iso/prj.conf | 0 .../bluetooth}/ll/iso/prj_vs_dp.conf | 0 .../bsim => bsim/bluetooth}/ll/iso/src/main.c | 0 .../ll/iso/tests_scripts/broadcast_iso.sh | 4 +- .../iso/tests_scripts/broadcast_iso_vs_dp.sh | 4 +- .../bluetooth}/mesh/CMakeLists.txt | 0 .../bsim => bsim/bluetooth}/mesh/README.rst | 2 +- .../bluetooth}/mesh/_mesh_test.sh | 4 +- .../bsim => bsim/bluetooth}/mesh/compile.sh | 18 +++--- .../bluetooth}/mesh/overlay_gatt.conf | 0 .../bluetooth}/mesh/overlay_low_lat.conf | 0 .../bluetooth}/mesh/overlay_pst.conf | 0 .../bsim => bsim/bluetooth}/mesh/prj.conf | 0 .../bluetooth}/mesh/prj_mesh1d1.conf | 0 .../bluetooth}/mesh/src/dfu_blob_common.c | 0 .../bluetooth}/mesh/src/dfu_blob_common.h | 0 .../bsim => bsim/bluetooth}/mesh/src/main.c | 0 .../bluetooth}/mesh/src/mesh_test.c | 0 .../bluetooth}/mesh/src/mesh_test.h | 0 .../mesh/src/settings_test_backend.c | 0 .../mesh/src/settings_test_backend.h | 0 .../bluetooth}/mesh/src/test_access.c | 0 .../bluetooth}/mesh/src/test_advertiser.c | 0 .../bluetooth}/mesh/src/test_beacon.c | 0 .../bluetooth}/mesh/src/test_blob.c | 0 .../bluetooth}/mesh/src/test_dfu.c | 0 .../bluetooth}/mesh/src/test_friendship.c | 0 .../bluetooth}/mesh/src/test_heartbeat.c | 0 .../bluetooth}/mesh/src/test_iv_index.c | 0 .../bluetooth}/mesh/src/test_lcd.c | 0 .../bluetooth}/mesh/src/test_op_agg.c | 0 .../bluetooth}/mesh/src/test_persistence.c | 0 .../bluetooth}/mesh/src/test_provision.c | 0 .../bluetooth}/mesh/src/test_replay_cache.c | 0 .../bluetooth}/mesh/src/test_sar.c | 0 .../bluetooth}/mesh/src/test_scanner.c | 0 .../bluetooth}/mesh/src/test_transport.c | 0 .../tests_scripts/access/access_cancel.sh | 0 .../tests_scripts/access/access_ext_sub.sh | 0 .../access/access_ext_sub_cap.sh | 0 .../tests_scripts/access/access_period.sh | 0 .../tests_scripts/access/access_transmit.sh | 0 .../tests_scripts/advertiser/proxy_mixin.sh | 0 .../tests_scripts/advertiser/random_order.sh | 0 .../tests_scripts/advertiser/reverse_order.sh | 0 .../tests_scripts/advertiser/send_order.sh | 0 .../tests_scripts/advertiser/tx_cb_multi.sh | 0 .../tests_scripts/advertiser/tx_cb_single.sh | 0 .../tests_scripts/beacon/beacon_interval.sh | 0 .../mesh/tests_scripts/beacon/invalid.sh | 0 .../mesh/tests_scripts/beacon/iv_update.sh | 0 .../mesh/tests_scripts/beacon/key_refresh.sh | 0 .../mesh/tests_scripts/beacon/kr_old_key.sh | 0 .../tests_scripts/beacon/multiple_netkeys.sh | 0 .../blob_mdls/blob_cli_broadcast.sh | 0 .../tests_scripts/blob_mdls/blob_cli_caps.sh | 0 .../blob_mdls/blob_cli_no_rsp.sh | 0 .../blob_mdls/blob_cli_persistent_transfer.sh | 0 .../blob_cli_persistent_transfer_pull.sh | 0 .../blob_mdls/blob_cli_trans_complete_pull.sh | 0 .../blob_mdls/blob_cli_trans_complete_push.sh | 0 .../blob_mdls/blob_cli_trans_resume_pull.sh | 0 .../blob_mdls/blob_cli_trans_resume_push.sh | 0 .../dfu/dfu_cli_persistent_transfer.sh | 0 .../tests_scripts/dfu/dfu_dist_self_update.sh | 0 .../dfu/dfu_dist_self_update_mult_targets.sh | 0 .../mesh/tests_scripts/dfu/dfu_mixed.sh | 0 .../mesh/tests_scripts/dfu/dfu_mixed_fail.sh | 0 .../mesh/tests_scripts/dfu/dfu_slot.sh | 0 .../tests_scripts/friendship/establish.sh | 0 .../friendship/establish_multi.sh | 0 .../tests_scripts/friendship/lpn_disable.sh | 0 .../tests_scripts/friendship/lpn_loopback.sh | 0 .../friendship/lpn_terminate_cb.sh | 0 .../mesh/tests_scripts/friendship/msg_frnd.sh | 0 .../tests_scripts/friendship/msg_group.sh | 0 .../mesh/tests_scripts/friendship/msg_mesh.sh | 0 .../friendship/msg_mesh_low_lat.sh | 0 .../mesh/tests_scripts/friendship/overflow.sh | 0 .../mesh/tests_scripts/friendship/poll.sh | 0 .../tests_scripts/friendship/re-establish.sh | 0 .../tests_scripts/heartbeat/sub_cb_api_all.sh | 0 .../heartbeat/sub_cb_api_unicast.sh | 0 .../tests_scripts/iv_index/iv_deferring.sh | 0 .../tests_scripts/iv_index/iv_recovery.sh | 0 .../mesh/tests_scripts/iv_index/iv_update.sh | 0 .../large_comp_data/get_comp_data_max_sdu.sh | 0 .../large_comp_data/get_comp_data_split.sh | 0 .../large_comp_data/get_metadata_max_sdu.sh | 0 .../large_comp_data/get_metadata_split.sh | 0 .../op_agg/full_status_msg_list.sh | 0 .../mesh/tests_scripts/persistence/access.sh | 0 .../mesh/tests_scripts/persistence/cfg.sh | 0 .../tests_scripts/persistence/provisioning.sh | 0 .../persistence/reprovisioning.sh | 0 .../provision/ivu_flag_one_duration.sh | 0 .../provision/ivu_flag_zero_duration.sh | 0 .../tests_scripts/provision/pb_adv_multi.sh | 0 .../tests_scripts/provision/pb_adv_no_oob.sh | 0 .../provision/pb_adv_oob_auth_ib_pk.sh | 0 .../pb_adv_oob_auth_ignore_oob_pk.sh | 0 .../provision/pb_adv_oob_auth_oob_pk.sh | 0 .../provision/pb_adv_reprovision.sh | 0 .../provision/pb_remote_nppi_robustness.sh | 0 .../provision/pb_remote_pst_ncrp.sh | 0 .../provision/pb_remote_reprovision.sh | 0 .../replay_cache/replay_attack.sh | 0 .../tests_scripts/replay_cache/rpl_frag.sh | 0 .../tests_scripts/sar/slow_transfer_test.sh | 0 .../mesh/tests_scripts/sar/stress_test.sh | 0 .../tests_scripts/scanner/invalid_ad_type.sh | 0 .../scanner/wrong_packet_length.sh | 0 .../mesh/tests_scripts/transport/group.sh | 0 .../mesh/tests_scripts/transport/loopback.sh | 0 .../tests_scripts/transport/loopback_group.sh | 0 .../transport/loopback_group_low_lat.sh | 0 .../mesh/tests_scripts/transport/seg_block.sh | 0 .../tests_scripts/transport/seg_concurrent.sh | 0 .../mesh/tests_scripts/transport/seg_fail.sh | 0 .../mesh/tests_scripts/transport/seg_ivu.sh | 0 .../mesh/tests_scripts/transport/unicast.sh | 0 .../transport/unicast_low_lat.sh | 0 .../tests_scripts/transport/unknown_app.sh | 0 .../mesh/tests_scripts/transport/va.sh | 0 .../bsim => bsim/bluetooth}/run_parallel.sh | 0 .../bsim => bsim/bluetooth}/sh_common.source | 0 500 files changed, 222 insertions(+), 222 deletions(-) delete mode 100755 tests/bluetooth/bsim/host/compile.sh rename tests/{bluetooth/bsim => bsim/bluetooth}/README.txt (58%) rename tests/{bluetooth/bsim => bsim/bluetooth}/_compile_permutate_kconfigs.sh (95%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/Kconfig (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/README.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/compile.sh (85%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/bap_broadcast_assistant_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/bap_scan_delegator_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/bap_unicast_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/bap_unicast_common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/bap_unicast_common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/bap_unicast_server_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/bass_broadcaster_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/broadcast_sink_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/broadcast_source_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/cap_acceptor_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/cap_initiator_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/csip_set_coordinator_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/csip_set_member_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/has_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/has_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/ias_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/ias_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/mcc_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/mcs_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/media_controller_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/micp_mic_ctlr_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/micp_mic_dev_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/tbs_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/tbs_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/vcp_vol_ctlr_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/src/vcp_vol_rend_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/_cap.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/bap_bass.sh (86%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/bap_broadcast_audio.sh (86%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/bap_unicast_audio.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/cap_broadcast.sh (90%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/cap_unicast.sh (90%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/csip.sh (81%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/has.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/ias.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/mcs_mcc.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/media_controller.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/micp.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/tbs.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/audio/test_scripts/vcp.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/compile.sh (65%) rename tests/{bluetooth/bsim => bsim/bluetooth}/compile.source (97%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/chain/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/chain/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/chain/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/chain/tests_scripts/adv_chain.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/prj_long_data.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/src/per_adv_advertiser.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/src/per_adv_syncer.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/tests_scripts/per_adv.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/tests_scripts/per_adv_conn.sh (90%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh (90%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/periodic/tests_scripts/per_adv_long_data.sh (90%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/prj_2.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/src/bs_bt_utils.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/src/bs_bt_utils.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/src/dut.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/src/tester.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/test_scripts/_compile.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/test_scripts/_env.sh (75%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/test_scripts/run_adv_resume.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/adv/resume/test_scripts/run_adv_resume_2.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/prj_autoconnect.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/prj_collision.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/prj_multiple_conn.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/src/main_autoconnect.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/src/main_collision.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/src/main_reconfigure.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/tests_scripts/autoconnect.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/tests_scripts/collision.sh (87%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/tests_scripts/multiple_conn.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt/tests_scripts/reconfigure.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/src/client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/src/server_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/eatt_notif/test_scripts/eatt_notif.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/mtu_update/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/mtu_update/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/mtu_update/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/mtu_update/test_scripts/_compile.sh (84%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/mtu_update/test_scripts/_env.sh (92%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/att/mtu_update/test_scripts/run_test.sh (100%) create mode 100755 tests/bsim/bluetooth/host/compile.sh rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/src/gatt_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/src/gatt_server_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/test_scripts/_run_test.sh (87%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_eatt.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_no_eatt.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_eatt.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_no_eatt.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/test_scripts/gatt_caching_retry_reads_eatt.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/caching/test_scripts/gatt_caching_retry_reads_no_eatt.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/src/gatt_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/src/gatt_server_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/general/test_scripts/gatt.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/src/gatt_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/src/gatt_server_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/_run_test.sh (87%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_enhanced_enhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_enhanced_mixed.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_enhanced_none.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_enhanced_unenhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_mixed_enhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_mixed_mixed.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_mixed_none.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_mixed_unenhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_none_enhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_none_mixed.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_none_none.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_none_unenhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_unenhanced_enhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_unenhanced_mixed.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_unenhanced_none.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify/test_scripts/gatt_notify_unenhanced_unenhanced.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/src/gatt_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/src/gatt_server_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/test_scripts/_notify-debug.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/notify_multiple/test_scripts/notify.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/prj_2.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/client.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/gatt_utils.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/gatt_utils.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/main.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/server.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/settings.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/utils.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/src/utils.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/test_scripts/_compile.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/test_scripts/_env.sh (75%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/test_scripts/run_gatt_settings.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/settings/test_scripts/run_gatt_settings_2.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/write/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/write/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/write/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/gatt/write/tests_scripts/gatt_write.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/general/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/general/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/general/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/general/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/general/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/general/src/main_l2cap_ecred.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/general/tests_scripts/l2cap.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/stress/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/stress/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/stress/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/stress/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/stress/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/stress/tests_scripts/l2cap.sh (95%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/userdata/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/userdata/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/userdata/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/userdata/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/userdata/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/userdata/src/main_l2cap_userdata.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/l2cap/userdata/tests_scripts/l2cap.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/src/common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/src/common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/src/gatt_client_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/src/gatt_server_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/src/main_disable.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/tests_scripts/disable.sh (93%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/disable/tests_scripts/disable_with_gatt.sh (90%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/multiple_id/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/multiple_id/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/multiple_id/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/misc/multiple_id/tests_scripts/multiple.sh (88%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/src/bs_bt_utils.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/src/bs_bt_utils.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/src/dut.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/src/tester.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/test_scripts/_compile.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/test_scripts/_env.sh (92%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/central/test_scripts/run_test.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/README.rst (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/src/test_undirected_central.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/src/test_undirected_main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/src/test_undirected_peripheral.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/test_scripts/_compile.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/test_scripts/_env.sh (86%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/device/test_scripts/run_tests.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/src/bs_bt_utils.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/src/bs_bt_utils.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/src/dut.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/src/tester.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/test_scripts/_compile.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/test_scripts/_env.sh (92%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/privacy/peripheral/test_scripts/run_test.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/src/bs_bt_utils.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/src/bs_bt_utils.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/src/central.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/src/peripheral.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/test_scripts/_compile.sh (84%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/test_scripts/_env.sh (92%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_allowed/test_scripts/run_test.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/src/bs_bt_utils.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/src/bs_bt_utils.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/src/central.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/src/peripheral.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/test_scripts/_compile.sh (84%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/test_scripts/_env.sh (92%) rename tests/{bluetooth/bsim => bsim/bluetooth}/host/security/bond_overwrite_denied/test_scripts/run_test.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/advx/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/advx/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/advx/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/advx/tests_scripts/basic_advx.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/compile.sh (57%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/README.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/prj_split.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/prj_split_low_lat.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/prj_split_privacy.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/src/test_connect1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/src/test_connect2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/src/test_empty.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/tests_scripts/basic_conn_encrypted_split.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/tests_scripts/basic_conn_split.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/conn/tests_scripts/basic_conn_split_low_lat.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/README.txt (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/common/commands.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/common/edtt_driver.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/common/edtt_driver_bsim.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/prj_llcp.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_a_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_a_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_a_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_a_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_a_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_a_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_d_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_d_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_d_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_d_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_d_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_d_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_e_2.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_e_2.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_e_3.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_e_3.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_f_1.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/service_f_1.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/gatt/services.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/gatt_test_app/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/hci_test_app/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/hci_test_app/prj_dut_llcp.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/hci_test_app/prj_tst_llcp.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/hci_test_app/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/_controller_tests_inner.sh (96%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/gap.llcp.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/gap.llcp.test_list (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/gatt.llcp.sh (90%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/gatt.llcp.test_list (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/hci.llcp.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/hci.llcp.test_list (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/ll.1.llcp.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/ll.2.llcp.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/ll.set1.llcp.test_list (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/edtt/tests_scripts/ll.set2.llcp.test_list (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/iso/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/iso/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/iso/prj_vs_dp.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/iso/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/iso/tests_scripts/broadcast_iso.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/ll/iso/tests_scripts/broadcast_iso_vs_dp.sh (89%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/CMakeLists.txt (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/README.rst (98%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/_mesh_test.sh (93%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/compile.sh (64%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/overlay_gatt.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/overlay_low_lat.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/overlay_pst.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/prj.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/prj_mesh1d1.conf (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/dfu_blob_common.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/dfu_blob_common.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/main.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/mesh_test.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/mesh_test.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/settings_test_backend.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/settings_test_backend.h (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_access.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_advertiser.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_beacon.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_blob.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_dfu.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_friendship.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_heartbeat.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_iv_index.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_lcd.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_op_agg.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_persistence.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_provision.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_replay_cache.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_sar.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_scanner.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/src/test_transport.c (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/access/access_cancel.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/access/access_ext_sub.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/access/access_ext_sub_cap.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/access/access_period.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/access/access_transmit.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/advertiser/proxy_mixin.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/advertiser/random_order.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/advertiser/reverse_order.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/advertiser/send_order.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/advertiser/tx_cb_multi.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/advertiser/tx_cb_single.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/beacon/beacon_interval.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/beacon/invalid.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/beacon/iv_update.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/beacon/key_refresh.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/beacon/kr_old_key.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/beacon/multiple_netkeys.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/dfu/dfu_dist_self_update.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/dfu/dfu_mixed.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/dfu/dfu_mixed_fail.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/dfu/dfu_slot.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/establish.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/establish_multi.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/lpn_disable.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/lpn_loopback.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/lpn_terminate_cb.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/msg_frnd.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/msg_group.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/msg_mesh.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/overflow.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/poll.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/friendship/re-establish.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/iv_index/iv_deferring.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/iv_index/iv_recovery.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/iv_index/iv_update.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/large_comp_data/get_metadata_split.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/op_agg/full_status_msg_list.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/persistence/access.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/persistence/cfg.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/persistence/provisioning.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/persistence/reprovisioning.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/ivu_flag_one_duration.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_adv_multi.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_adv_no_oob.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_adv_reprovision.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/provision/pb_remote_reprovision.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/replay_cache/replay_attack.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/replay_cache/rpl_frag.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/sar/slow_transfer_test.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/sar/stress_test.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/scanner/invalid_ad_type.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/scanner/wrong_packet_length.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/group.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/loopback.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/loopback_group.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/loopback_group_low_lat.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/seg_block.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/seg_concurrent.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/seg_fail.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/seg_ivu.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/unicast.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/unicast_low_lat.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/unknown_app.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/mesh/tests_scripts/transport/va.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/run_parallel.sh (100%) rename tests/{bluetooth/bsim => bsim/bluetooth}/sh_common.source (100%) diff --git a/.github/workflows/bluetooth-tests.yaml b/.github/workflows/bluetooth-tests.yaml index 5c4153cc126..6a059407c81 100644 --- 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/**" + - "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() diff --git a/CODEOWNERS b/CODEOWNERS index a8e818d9827..539c3bc26cf 100644 --- a/CODEOWNERS +++ b/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 diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 975b54e5ce4..a94592f0811 100644 --- a/MAINTAINERS.yml +++ b/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" diff --git a/tests/bluetooth/bsim/host/compile.sh b/tests/bluetooth/bsim/host/compile.sh deleted file mode 100755 index 5b56fb8495b..00000000000 --- a/tests/bluetooth/bsim/host/compile.sh +++ /dev/null @@ -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 diff --git a/tests/bluetooth/bsim/README.txt b/tests/bsim/bluetooth/README.txt similarity index 58% rename from tests/bluetooth/bsim/README.txt rename to tests/bsim/bluetooth/README.txt index 9edb580bd09..9730170b0a8 100644 --- a/tests/bluetooth/bsim/README.txt +++ b/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 diff --git a/tests/bluetooth/bsim/_compile_permutate_kconfigs.sh b/tests/bsim/bluetooth/_compile_permutate_kconfigs.sh similarity index 95% rename from tests/bluetooth/bsim/_compile_permutate_kconfigs.sh rename to tests/bsim/bluetooth/_compile_permutate_kconfigs.sh index 7f6bacb729b..61af911041f 100755 --- a/tests/bluetooth/bsim/_compile_permutate_kconfigs.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/CMakeLists.txt b/tests/bsim/bluetooth/audio/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/audio/CMakeLists.txt rename to tests/bsim/bluetooth/audio/CMakeLists.txt diff --git a/tests/bluetooth/bsim/audio/Kconfig b/tests/bsim/bluetooth/audio/Kconfig similarity index 100% rename from tests/bluetooth/bsim/audio/Kconfig rename to tests/bsim/bluetooth/audio/Kconfig diff --git a/tests/bluetooth/bsim/audio/README.txt b/tests/bsim/bluetooth/audio/README.txt similarity index 100% rename from tests/bluetooth/bsim/audio/README.txt rename to tests/bsim/bluetooth/audio/README.txt diff --git a/tests/bluetooth/bsim/audio/compile.sh b/tests/bsim/bluetooth/audio/compile.sh similarity index 85% rename from tests/bluetooth/bsim/audio/compile.sh rename to tests/bsim/bluetooth/audio/compile.sh index 2f0f15f2103..62c06c3a45a 100755 --- a/tests/bluetooth/bsim/audio/compile.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf similarity index 100% rename from tests/bluetooth/bsim/audio/prj.conf rename to tests/bsim/bluetooth/audio/prj.conf diff --git a/tests/bluetooth/bsim/audio/src/bap_broadcast_assistant_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/bap_broadcast_assistant_test.c rename to tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c diff --git a/tests/bluetooth/bsim/audio/src/bap_scan_delegator_test.c b/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/bap_scan_delegator_test.c rename to tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c diff --git a/tests/bluetooth/bsim/audio/src/bap_unicast_client_test.c b/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/bap_unicast_client_test.c rename to tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c diff --git a/tests/bluetooth/bsim/audio/src/bap_unicast_common.c b/tests/bsim/bluetooth/audio/src/bap_unicast_common.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/bap_unicast_common.c rename to tests/bsim/bluetooth/audio/src/bap_unicast_common.c diff --git a/tests/bluetooth/bsim/audio/src/bap_unicast_common.h b/tests/bsim/bluetooth/audio/src/bap_unicast_common.h similarity index 100% rename from tests/bluetooth/bsim/audio/src/bap_unicast_common.h rename to tests/bsim/bluetooth/audio/src/bap_unicast_common.h diff --git a/tests/bluetooth/bsim/audio/src/bap_unicast_server_test.c b/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/bap_unicast_server_test.c rename to tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c diff --git a/tests/bluetooth/bsim/audio/src/bass_broadcaster_test.c b/tests/bsim/bluetooth/audio/src/bass_broadcaster_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/bass_broadcaster_test.c rename to tests/bsim/bluetooth/audio/src/bass_broadcaster_test.c diff --git a/tests/bluetooth/bsim/audio/src/broadcast_sink_test.c b/tests/bsim/bluetooth/audio/src/broadcast_sink_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/broadcast_sink_test.c rename to tests/bsim/bluetooth/audio/src/broadcast_sink_test.c diff --git a/tests/bluetooth/bsim/audio/src/broadcast_source_test.c b/tests/bsim/bluetooth/audio/src/broadcast_source_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/broadcast_source_test.c rename to tests/bsim/bluetooth/audio/src/broadcast_source_test.c diff --git a/tests/bluetooth/bsim/audio/src/cap_acceptor_test.c b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/cap_acceptor_test.c rename to tests/bsim/bluetooth/audio/src/cap_acceptor_test.c diff --git a/tests/bluetooth/bsim/audio/src/cap_initiator_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/cap_initiator_test.c rename to tests/bsim/bluetooth/audio/src/cap_initiator_test.c diff --git a/tests/bluetooth/bsim/audio/src/common.c b/tests/bsim/bluetooth/audio/src/common.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/common.c rename to tests/bsim/bluetooth/audio/src/common.c diff --git a/tests/bluetooth/bsim/audio/src/common.h b/tests/bsim/bluetooth/audio/src/common.h similarity index 100% rename from tests/bluetooth/bsim/audio/src/common.h rename to tests/bsim/bluetooth/audio/src/common.h diff --git a/tests/bluetooth/bsim/audio/src/csip_set_coordinator_test.c b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/csip_set_coordinator_test.c rename to tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c diff --git a/tests/bluetooth/bsim/audio/src/csip_set_member_test.c b/tests/bsim/bluetooth/audio/src/csip_set_member_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/csip_set_member_test.c rename to tests/bsim/bluetooth/audio/src/csip_set_member_test.c diff --git a/tests/bluetooth/bsim/audio/src/has_client_test.c b/tests/bsim/bluetooth/audio/src/has_client_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/has_client_test.c rename to tests/bsim/bluetooth/audio/src/has_client_test.c diff --git a/tests/bluetooth/bsim/audio/src/has_test.c b/tests/bsim/bluetooth/audio/src/has_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/has_test.c rename to tests/bsim/bluetooth/audio/src/has_test.c diff --git a/tests/bluetooth/bsim/audio/src/ias_client_test.c b/tests/bsim/bluetooth/audio/src/ias_client_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/ias_client_test.c rename to tests/bsim/bluetooth/audio/src/ias_client_test.c diff --git a/tests/bluetooth/bsim/audio/src/ias_test.c b/tests/bsim/bluetooth/audio/src/ias_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/ias_test.c rename to tests/bsim/bluetooth/audio/src/ias_test.c diff --git a/tests/bluetooth/bsim/audio/src/main.c b/tests/bsim/bluetooth/audio/src/main.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/main.c rename to tests/bsim/bluetooth/audio/src/main.c diff --git a/tests/bluetooth/bsim/audio/src/mcc_test.c b/tests/bsim/bluetooth/audio/src/mcc_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/mcc_test.c rename to tests/bsim/bluetooth/audio/src/mcc_test.c diff --git a/tests/bluetooth/bsim/audio/src/mcs_test.c b/tests/bsim/bluetooth/audio/src/mcs_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/mcs_test.c rename to tests/bsim/bluetooth/audio/src/mcs_test.c diff --git a/tests/bluetooth/bsim/audio/src/media_controller_test.c b/tests/bsim/bluetooth/audio/src/media_controller_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/media_controller_test.c rename to tests/bsim/bluetooth/audio/src/media_controller_test.c diff --git a/tests/bluetooth/bsim/audio/src/micp_mic_ctlr_test.c b/tests/bsim/bluetooth/audio/src/micp_mic_ctlr_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/micp_mic_ctlr_test.c rename to tests/bsim/bluetooth/audio/src/micp_mic_ctlr_test.c diff --git a/tests/bluetooth/bsim/audio/src/micp_mic_dev_test.c b/tests/bsim/bluetooth/audio/src/micp_mic_dev_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/micp_mic_dev_test.c rename to tests/bsim/bluetooth/audio/src/micp_mic_dev_test.c diff --git a/tests/bluetooth/bsim/audio/src/tbs_client_test.c b/tests/bsim/bluetooth/audio/src/tbs_client_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/tbs_client_test.c rename to tests/bsim/bluetooth/audio/src/tbs_client_test.c diff --git a/tests/bluetooth/bsim/audio/src/tbs_test.c b/tests/bsim/bluetooth/audio/src/tbs_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/tbs_test.c rename to tests/bsim/bluetooth/audio/src/tbs_test.c diff --git a/tests/bluetooth/bsim/audio/src/vcp_vol_ctlr_test.c b/tests/bsim/bluetooth/audio/src/vcp_vol_ctlr_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/vcp_vol_ctlr_test.c rename to tests/bsim/bluetooth/audio/src/vcp_vol_ctlr_test.c diff --git a/tests/bluetooth/bsim/audio/src/vcp_vol_rend_test.c b/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c similarity index 100% rename from tests/bluetooth/bsim/audio/src/vcp_vol_rend_test.c rename to tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c diff --git a/tests/bluetooth/bsim/audio/test_scripts/_cap.sh b/tests/bsim/bluetooth/audio/test_scripts/_cap.sh similarity index 100% rename from tests/bluetooth/bsim/audio/test_scripts/_cap.sh rename to tests/bsim/bluetooth/audio/test_scripts/_cap.sh diff --git a/tests/bluetooth/bsim/audio/test_scripts/bap_bass.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_bass.sh similarity index 86% rename from tests/bluetooth/bsim/audio/test_scripts/bap_bass.sh rename to tests/bsim/bluetooth/audio/test_scripts/bap_bass.sh index a6130e08d35..7a08b12313f 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/bap_bass.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/bap_broadcast_audio.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh similarity index 86% rename from tests/bluetooth/bsim/audio/test_scripts/bap_broadcast_audio.sh rename to tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh index 2a4aa16ea5c..2e5b7d4c2d2 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/bap_broadcast_audio.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/bap_unicast_audio.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio.sh similarity index 89% rename from tests/bluetooth/bsim/audio/test_scripts/bap_unicast_audio.sh rename to tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio.sh index a1e34d1826d..9d9b82ea9bc 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/bap_unicast_audio.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/cap_broadcast.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast.sh similarity index 90% rename from tests/bluetooth/bsim/audio/test_scripts/cap_broadcast.sh rename to tests/bsim/bluetooth/audio/test_scripts/cap_broadcast.sh index bf130c1d7c9..5f448cf2279 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/cap_broadcast.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/cap_unicast.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast.sh similarity index 90% rename from tests/bluetooth/bsim/audio/test_scripts/cap_unicast.sh rename to tests/bsim/bluetooth/audio/test_scripts/cap_unicast.sh index d8b11220a77..f0ed6f2c3bb 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/cap_unicast.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/csip.sh b/tests/bsim/bluetooth/audio/test_scripts/csip.sh similarity index 81% rename from tests/bluetooth/bsim/audio/test_scripts/csip.sh rename to tests/bsim/bluetooth/audio/test_scripts/csip.sh index 49487010952..20b307a2ff8 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/csip.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/has.sh b/tests/bsim/bluetooth/audio/test_scripts/has.sh similarity index 88% rename from tests/bluetooth/bsim/audio/test_scripts/has.sh rename to tests/bsim/bluetooth/audio/test_scripts/has.sh index 65fadd1e175..b35c7c13186 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/has.sh +++ b/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} \ diff --git a/tests/bluetooth/bsim/audio/test_scripts/ias.sh b/tests/bsim/bluetooth/audio/test_scripts/ias.sh similarity index 89% rename from tests/bluetooth/bsim/audio/test_scripts/ias.sh rename to tests/bsim/bluetooth/audio/test_scripts/ias.sh index a3df49073b4..a310c1dd232 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/ias.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/mcs_mcc.sh b/tests/bsim/bluetooth/audio/test_scripts/mcs_mcc.sh similarity index 89% rename from tests/bluetooth/bsim/audio/test_scripts/mcs_mcc.sh rename to tests/bsim/bluetooth/audio/test_scripts/mcs_mcc.sh index 35146c77473..679b3026af1 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/mcs_mcc.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/media_controller.sh b/tests/bsim/bluetooth/audio/test_scripts/media_controller.sh similarity index 89% rename from tests/bluetooth/bsim/audio/test_scripts/media_controller.sh rename to tests/bsim/bluetooth/audio/test_scripts/media_controller.sh index a88d6bfda8a..16a913a7dac 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/media_controller.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/micp.sh b/tests/bsim/bluetooth/audio/test_scripts/micp.sh similarity index 89% rename from tests/bluetooth/bsim/audio/test_scripts/micp.sh rename to tests/bsim/bluetooth/audio/test_scripts/micp.sh index 562dbe4439c..06c201319d3 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/micp.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/tbs.sh b/tests/bsim/bluetooth/audio/test_scripts/tbs.sh similarity index 89% rename from tests/bluetooth/bsim/audio/test_scripts/tbs.sh rename to tests/bsim/bluetooth/audio/test_scripts/tbs.sh index cb73fb0f039..84b44a29dec 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/tbs.sh +++ b/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 diff --git a/tests/bluetooth/bsim/audio/test_scripts/vcp.sh b/tests/bsim/bluetooth/audio/test_scripts/vcp.sh similarity index 89% rename from tests/bluetooth/bsim/audio/test_scripts/vcp.sh rename to tests/bsim/bluetooth/audio/test_scripts/vcp.sh index fb170d911db..56e28e78aad 100755 --- a/tests/bluetooth/bsim/audio/test_scripts/vcp.sh +++ b/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 diff --git a/tests/bluetooth/bsim/compile.sh b/tests/bsim/bluetooth/compile.sh similarity index 65% rename from tests/bluetooth/bsim/compile.sh rename to tests/bsim/bluetooth/compile.sh index 858138a5659..eceee81e5ef 100755 --- a/tests/bluetooth/bsim/compile.sh +++ b/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 diff --git a/tests/bluetooth/bsim/compile.source b/tests/bsim/bluetooth/compile.source similarity index 97% rename from tests/bluetooth/bsim/compile.source rename to tests/bsim/bluetooth/compile.source index 0107f713517..cc54fb6bddc 100644 --- a/tests/bluetooth/bsim/compile.source +++ b/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\ diff --git a/tests/bluetooth/bsim/host/adv/chain/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/adv/chain/CMakeLists.txt rename to tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/adv/chain/prj.conf b/tests/bsim/bluetooth/host/adv/chain/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/adv/chain/prj.conf rename to tests/bsim/bluetooth/host/adv/chain/prj.conf diff --git a/tests/bluetooth/bsim/host/adv/chain/src/main.c b/tests/bsim/bluetooth/host/adv/chain/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/chain/src/main.c rename to tests/bsim/bluetooth/host/adv/chain/src/main.c diff --git a/tests/bluetooth/bsim/host/adv/chain/tests_scripts/adv_chain.sh b/tests/bsim/bluetooth/host/adv/chain/tests_scripts/adv_chain.sh similarity index 88% rename from tests/bluetooth/bsim/host/adv/chain/tests_scripts/adv_chain.sh rename to tests/bsim/bluetooth/host/adv/chain/tests_scripts/adv_chain.sh index 0ce63588fa5..28b608efd34 100755 --- a/tests/bluetooth/bsim/host/adv/chain/tests_scripts/adv_chain.sh +++ b/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} \ diff --git a/tests/bluetooth/bsim/host/adv/periodic/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/CMakeLists.txt rename to tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/adv/periodic/prj.conf b/tests/bsim/bluetooth/host/adv/periodic/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/prj.conf rename to tests/bsim/bluetooth/host/adv/periodic/prj.conf diff --git a/tests/bluetooth/bsim/host/adv/periodic/prj_long_data.conf b/tests/bsim/bluetooth/host/adv/periodic/prj_long_data.conf similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/prj_long_data.conf rename to tests/bsim/bluetooth/host/adv/periodic/prj_long_data.conf diff --git a/tests/bluetooth/bsim/host/adv/periodic/src/common.c b/tests/bsim/bluetooth/host/adv/periodic/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/src/common.c rename to tests/bsim/bluetooth/host/adv/periodic/src/common.c diff --git a/tests/bluetooth/bsim/host/adv/periodic/src/common.h b/tests/bsim/bluetooth/host/adv/periodic/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/src/common.h rename to tests/bsim/bluetooth/host/adv/periodic/src/common.h diff --git a/tests/bluetooth/bsim/host/adv/periodic/src/main.c b/tests/bsim/bluetooth/host/adv/periodic/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/src/main.c rename to tests/bsim/bluetooth/host/adv/periodic/src/main.c diff --git a/tests/bluetooth/bsim/host/adv/periodic/src/per_adv_advertiser.c b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/src/per_adv_advertiser.c rename to tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c diff --git a/tests/bluetooth/bsim/host/adv/periodic/src/per_adv_syncer.c b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_syncer.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/periodic/src/per_adv_syncer.c rename to tests/bsim/bluetooth/host/adv/periodic/src/per_adv_syncer.c diff --git a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh similarity index 89% rename from tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv.sh rename to tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh index 19dd00fbcff..3d1e189a776 100755 --- a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv.sh +++ b/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 diff --git a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_conn.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh similarity index 90% rename from tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_conn.sh rename to tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh index d7c18d01878..70dbdb101b1 100755 --- a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_conn.sh +++ b/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 diff --git a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh similarity index 90% rename from tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh rename to tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh index c85c52653f2..eede26ce116 100755 --- a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh +++ b/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 diff --git a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_long_data.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh similarity index 90% rename from tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_long_data.sh rename to tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh index 870c73d4513..6b4e65438bc 100755 --- a/tests/bluetooth/bsim/host/adv/periodic/tests_scripts/per_adv_long_data.sh +++ b/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 diff --git a/tests/bluetooth/bsim/host/adv/resume/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/resume/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/CMakeLists.txt rename to tests/bsim/bluetooth/host/adv/resume/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/adv/resume/prj.conf b/tests/bsim/bluetooth/host/adv/resume/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/prj.conf rename to tests/bsim/bluetooth/host/adv/resume/prj.conf diff --git a/tests/bluetooth/bsim/host/adv/resume/prj_2.conf b/tests/bsim/bluetooth/host/adv/resume/prj_2.conf similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/prj_2.conf rename to tests/bsim/bluetooth/host/adv/resume/prj_2.conf diff --git a/tests/bluetooth/bsim/host/adv/resume/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/src/bs_bt_utils.c rename to tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.c diff --git a/tests/bluetooth/bsim/host/adv/resume/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.h similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/src/bs_bt_utils.h rename to tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.h diff --git a/tests/bluetooth/bsim/host/adv/resume/src/dut.c b/tests/bsim/bluetooth/host/adv/resume/src/dut.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/src/dut.c rename to tests/bsim/bluetooth/host/adv/resume/src/dut.c diff --git a/tests/bluetooth/bsim/host/adv/resume/src/main.c b/tests/bsim/bluetooth/host/adv/resume/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/src/main.c rename to tests/bsim/bluetooth/host/adv/resume/src/main.c diff --git a/tests/bluetooth/bsim/host/adv/resume/src/tester.c b/tests/bsim/bluetooth/host/adv/resume/src/tester.c similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/src/tester.c rename to tests/bsim/bluetooth/host/adv/resume/src/tester.c diff --git a/tests/bluetooth/bsim/host/adv/resume/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/adv/resume/test_scripts/_compile.sh similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/adv/resume/test_scripts/_compile.sh diff --git a/tests/bluetooth/bsim/host/adv/resume/test_scripts/_env.sh b/tests/bsim/bluetooth/host/adv/resume/test_scripts/_env.sh similarity index 75% rename from tests/bluetooth/bsim/host/adv/resume/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/adv/resume/test_scripts/_env.sh index 2b315a1e9f5..98dff68bc08 100755 --- a/tests/bluetooth/bsim/host/adv/resume/test_scripts/_env.sh +++ b/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" diff --git a/tests/bluetooth/bsim/host/adv/resume/test_scripts/run_adv_resume.sh b/tests/bsim/bluetooth/host/adv/resume/test_scripts/run_adv_resume.sh similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/test_scripts/run_adv_resume.sh rename to tests/bsim/bluetooth/host/adv/resume/test_scripts/run_adv_resume.sh diff --git a/tests/bluetooth/bsim/host/adv/resume/test_scripts/run_adv_resume_2.sh b/tests/bsim/bluetooth/host/adv/resume/test_scripts/run_adv_resume_2.sh similarity index 100% rename from tests/bluetooth/bsim/host/adv/resume/test_scripts/run_adv_resume_2.sh rename to tests/bsim/bluetooth/host/adv/resume/test_scripts/run_adv_resume_2.sh diff --git a/tests/bluetooth/bsim/host/att/eatt/CMakeLists.txt b/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/CMakeLists.txt rename to tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/att/eatt/prj_autoconnect.conf b/tests/bsim/bluetooth/host/att/eatt/prj_autoconnect.conf similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/prj_autoconnect.conf rename to tests/bsim/bluetooth/host/att/eatt/prj_autoconnect.conf diff --git a/tests/bluetooth/bsim/host/att/eatt/prj_collision.conf b/tests/bsim/bluetooth/host/att/eatt/prj_collision.conf similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/prj_collision.conf rename to tests/bsim/bluetooth/host/att/eatt/prj_collision.conf diff --git a/tests/bluetooth/bsim/host/att/eatt/prj_multiple_conn.conf b/tests/bsim/bluetooth/host/att/eatt/prj_multiple_conn.conf similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/prj_multiple_conn.conf rename to tests/bsim/bluetooth/host/att/eatt/prj_multiple_conn.conf diff --git a/tests/bluetooth/bsim/host/att/eatt/src/common.c b/tests/bsim/bluetooth/host/att/eatt/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/src/common.c rename to tests/bsim/bluetooth/host/att/eatt/src/common.c diff --git a/tests/bluetooth/bsim/host/att/eatt/src/common.h b/tests/bsim/bluetooth/host/att/eatt/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/src/common.h rename to tests/bsim/bluetooth/host/att/eatt/src/common.h diff --git a/tests/bluetooth/bsim/host/att/eatt/src/main.c b/tests/bsim/bluetooth/host/att/eatt/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/src/main.c rename to tests/bsim/bluetooth/host/att/eatt/src/main.c diff --git a/tests/bluetooth/bsim/host/att/eatt/src/main_autoconnect.c b/tests/bsim/bluetooth/host/att/eatt/src/main_autoconnect.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/src/main_autoconnect.c rename to tests/bsim/bluetooth/host/att/eatt/src/main_autoconnect.c diff --git a/tests/bluetooth/bsim/host/att/eatt/src/main_collision.c b/tests/bsim/bluetooth/host/att/eatt/src/main_collision.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/src/main_collision.c rename to tests/bsim/bluetooth/host/att/eatt/src/main_collision.c diff --git a/tests/bluetooth/bsim/host/att/eatt/src/main_reconfigure.c b/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt/src/main_reconfigure.c rename to tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c diff --git a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/autoconnect.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh similarity index 88% rename from tests/bluetooth/bsim/host/att/eatt/tests_scripts/autoconnect.sh rename to tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh index a1a0e4eccd5..3aa2c68bee6 100755 --- a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/autoconnect.sh +++ b/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} \ diff --git a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/collision.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh similarity index 87% rename from tests/bluetooth/bsim/host/att/eatt/tests_scripts/collision.sh rename to tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh index b040d7b6958..eae7e1e9966 100755 --- a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/collision.sh +++ b/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} \ diff --git a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/multiple_conn.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh similarity index 88% rename from tests/bluetooth/bsim/host/att/eatt/tests_scripts/multiple_conn.sh rename to tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh index 0fe8fad56a3..d5f3482885d 100755 --- a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/multiple_conn.sh +++ b/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} \ diff --git a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/reconfigure.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh similarity index 88% rename from tests/bluetooth/bsim/host/att/eatt/tests_scripts/reconfigure.sh rename to tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh index c927000c04e..599329ce2b5 100755 --- a/tests/bluetooth/bsim/host/att/eatt/tests_scripts/reconfigure.sh +++ b/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} \ diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/CMakeLists.txt b/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt_notif/CMakeLists.txt rename to tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/prj.conf b/tests/bsim/bluetooth/host/att/eatt_notif/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt_notif/prj.conf rename to tests/bsim/bluetooth/host/att/eatt_notif/prj.conf diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/src/client_test.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt_notif/src/client_test.c rename to tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/src/common.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt_notif/src/common.c rename to tests/bsim/bluetooth/host/att/eatt_notif/src/common.c diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/src/common.h b/tests/bsim/bluetooth/host/att/eatt_notif/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt_notif/src/common.h rename to tests/bsim/bluetooth/host/att/eatt_notif/src/common.h diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/src/main.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt_notif/src/main.c rename to tests/bsim/bluetooth/host/att/eatt_notif/src/main.c diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/src/server_test.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c similarity index 100% rename from tests/bluetooth/bsim/host/att/eatt_notif/src/server_test.c rename to tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c diff --git a/tests/bluetooth/bsim/host/att/eatt_notif/test_scripts/eatt_notif.sh b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh similarity index 88% rename from tests/bluetooth/bsim/host/att/eatt_notif/test_scripts/eatt_notif.sh rename to tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh index 50201e43ae0..0d3bcb2967d 100755 --- a/tests/bluetooth/bsim/host/att/eatt_notif/test_scripts/eatt_notif.sh +++ b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh @@ -24,10 +24,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_notif_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_notif_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=client -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_att_eatt_notif_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_att_eatt_notif_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=server Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/att/mtu_update/CMakeLists.txt b/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/att/mtu_update/CMakeLists.txt rename to tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/att/mtu_update/prj.conf b/tests/bsim/bluetooth/host/att/mtu_update/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/att/mtu_update/prj.conf rename to tests/bsim/bluetooth/host/att/mtu_update/prj.conf diff --git a/tests/bluetooth/bsim/host/att/mtu_update/src/main.c b/tests/bsim/bluetooth/host/att/mtu_update/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/att/mtu_update/src/main.c rename to tests/bsim/bluetooth/host/att/mtu_update/src/main.c diff --git a/tests/bluetooth/bsim/host/att/mtu_update/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh similarity index 84% rename from tests/bluetooth/bsim/host/att/mtu_update/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh index 10d6a94dc96..282f454f30b 100755 --- a/tests/bluetooth/bsim/host/att/mtu_update/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh @@ -18,5 +18,5 @@ BOARD="${BOARD:-nrf52_bsim}" BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" INCR_BUILD=1 mkdir -p ${WORK_DIR} -source ${ZEPHYR_BASE}/tests/bluetooth/bsim/compile.source -app="tests/bluetooth/bsim/$test_name" compile +source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source +app="tests/bsim/bluetooth/$test_name" compile diff --git a/tests/bluetooth/bsim/host/att/mtu_update/test_scripts/_env.sh b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_env.sh similarity index 92% rename from tests/bluetooth/bsim/host/att/mtu_update/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_env.sh index e8480ac6df6..30ba589fe88 100755 --- a/tests/bluetooth/bsim/host/att/mtu_update/test_scripts/_env.sh +++ b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_env.sh @@ -11,7 +11,7 @@ bsim_bin="${BSIM_OUT_PATH}/bin" verbosity_level=2 BOARD="${BOARD:-nrf52_bsim}" simulation_id="$test_name" -central_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_att_mtu_update_prj_conf" +central_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_att_mtu_update_prj_conf" peripheral_exe="${central_exe}" function print_var { diff --git a/tests/bluetooth/bsim/host/att/mtu_update/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/run_test.sh similarity index 100% rename from tests/bluetooth/bsim/host/att/mtu_update/test_scripts/run_test.sh rename to tests/bsim/bluetooth/host/att/mtu_update/test_scripts/run_test.sh diff --git a/tests/bsim/bluetooth/host/compile.sh b/tests/bsim/bluetooth/host/compile.sh new file mode 100755 index 00000000000..6358ec2ce05 --- /dev/null +++ b/tests/bsim/bluetooth/host/compile.sh @@ -0,0 +1,57 @@ +#!/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/bsim/bluetooth/compile.source + +app=tests/bsim/bluetooth/host/adv/resume compile +app=tests/bsim/bluetooth/host/adv/resume conf_file=prj_2.conf compile +app=tests/bsim/bluetooth/host/adv/chain compile +app=tests/bsim/bluetooth/host/adv/periodic compile +app=tests/bsim/bluetooth/host/adv/periodic conf_file=prj_long_data.conf compile + +app=tests/bsim/bluetooth/host/att/eatt conf_file=prj_collision.conf compile +app=tests/bsim/bluetooth/host/att/eatt conf_file=prj_multiple_conn.conf compile +app=tests/bsim/bluetooth/host/att/eatt conf_file=prj_autoconnect.conf compile +app=tests/bsim/bluetooth/host/att/eatt_notif conf_file=prj.conf compile +app=tests/bsim/bluetooth/host/att/mtu_update compile + +app=tests/bsim/bluetooth/host/gatt/caching compile +app=tests/bsim/bluetooth/host/gatt/general compile +app=tests/bsim/bluetooth/host/gatt/notify compile +app=tests/bsim/bluetooth/host/gatt/notify_multiple compile +app=tests/bsim/bluetooth/host/gatt/settings compile +app=tests/bsim/bluetooth/host/gatt/settings conf_file=prj_2.conf compile +app=tests/bsim/bluetooth/host/gatt/write compile + +app=tests/bsim/bluetooth/host/l2cap/general compile +app=tests/bsim/bluetooth/host/l2cap/userdata compile +app=tests/bsim/bluetooth/host/l2cap/stress compile + +app=tests/bsim/bluetooth/host/misc/disable compile +app=tests/bsim/bluetooth/host/misc/multiple_id compile + +app=tests/bsim/bluetooth/host/privacy/central compile +app=tests/bsim/bluetooth/host/privacy/peripheral compile +app=tests/bsim/bluetooth/host/privacy/device compile + +app=tests/bsim/bluetooth/host/security/bond_overwrite_allowed compile +app=tests/bsim/bluetooth/host/security/bond_overwrite_denied compile + +wait_for_background_jobs diff --git a/tests/bluetooth/bsim/host/gatt/caching/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/CMakeLists.txt rename to tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/gatt/caching/prj.conf b/tests/bsim/bluetooth/host/gatt/caching/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/prj.conf rename to tests/bsim/bluetooth/host/gatt/caching/prj.conf diff --git a/tests/bluetooth/bsim/host/gatt/caching/src/common.c b/tests/bsim/bluetooth/host/gatt/caching/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/src/common.c rename to tests/bsim/bluetooth/host/gatt/caching/src/common.c diff --git a/tests/bluetooth/bsim/host/gatt/caching/src/common.h b/tests/bsim/bluetooth/host/gatt/caching/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/src/common.h rename to tests/bsim/bluetooth/host/gatt/caching/src/common.h diff --git a/tests/bluetooth/bsim/host/gatt/caching/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/src/gatt_client_test.c rename to tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c diff --git a/tests/bluetooth/bsim/host/gatt/caching/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/src/gatt_server_test.c rename to tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c diff --git a/tests/bluetooth/bsim/host/gatt/caching/src/main.c b/tests/bsim/bluetooth/host/gatt/caching/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/src/main.c rename to tests/bsim/bluetooth/host/gatt/caching/src/main.c diff --git a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh similarity index 87% rename from tests/bluetooth/bsim/host/gatt/caching/test_scripts/_run_test.sh rename to tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh index 3be231bc03d..478febd7484 100755 --- a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/_run_test.sh +++ b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh @@ -23,10 +23,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_caching_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_caching_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_caching_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_caching_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_eatt.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_eatt.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_eatt.sh rename to tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_eatt.sh diff --git a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_no_eatt.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_no_eatt.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_no_eatt.sh rename to tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_db_hash_read_no_eatt.sh diff --git a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_eatt.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_eatt.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_eatt.sh rename to tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_eatt.sh diff --git a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_no_eatt.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_no_eatt.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_no_eatt.sh rename to tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_out_of_sync_no_eatt.sh diff --git a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_retry_reads_eatt.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_retry_reads_eatt.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_retry_reads_eatt.sh rename to tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_retry_reads_eatt.sh diff --git a/tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_retry_reads_no_eatt.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_retry_reads_no_eatt.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/caching/test_scripts/gatt_caching_retry_reads_no_eatt.sh rename to tests/bsim/bluetooth/host/gatt/caching/test_scripts/gatt_caching_retry_reads_no_eatt.sh diff --git a/tests/bluetooth/bsim/host/gatt/general/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/gatt/general/CMakeLists.txt rename to tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/gatt/general/prj.conf b/tests/bsim/bluetooth/host/gatt/general/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/gatt/general/prj.conf rename to tests/bsim/bluetooth/host/gatt/general/prj.conf diff --git a/tests/bluetooth/bsim/host/gatt/general/src/common.c b/tests/bsim/bluetooth/host/gatt/general/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/general/src/common.c rename to tests/bsim/bluetooth/host/gatt/general/src/common.c diff --git a/tests/bluetooth/bsim/host/gatt/general/src/common.h b/tests/bsim/bluetooth/host/gatt/general/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/gatt/general/src/common.h rename to tests/bsim/bluetooth/host/gatt/general/src/common.h diff --git a/tests/bluetooth/bsim/host/gatt/general/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/general/src/gatt_client_test.c rename to tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c diff --git a/tests/bluetooth/bsim/host/gatt/general/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/general/src/gatt_server_test.c rename to tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c diff --git a/tests/bluetooth/bsim/host/gatt/general/src/main.c b/tests/bsim/bluetooth/host/gatt/general/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/general/src/main.c rename to tests/bsim/bluetooth/host/gatt/general/src/main.c diff --git a/tests/bluetooth/bsim/host/gatt/general/test_scripts/gatt.sh b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh similarity index 89% rename from tests/bluetooth/bsim/host/gatt/general/test_scripts/gatt.sh rename to tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh index a5f1c1a10fb..53be981b117 100755 --- a/tests/bluetooth/bsim/host/gatt/general/test_scripts/gatt.sh +++ b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh @@ -25,10 +25,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_general_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_general_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_general_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_general_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/gatt/notify/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/CMakeLists.txt rename to tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/gatt/notify/prj.conf b/tests/bsim/bluetooth/host/gatt/notify/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/prj.conf rename to tests/bsim/bluetooth/host/gatt/notify/prj.conf diff --git a/tests/bluetooth/bsim/host/gatt/notify/src/common.c b/tests/bsim/bluetooth/host/gatt/notify/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/src/common.c rename to tests/bsim/bluetooth/host/gatt/notify/src/common.c diff --git a/tests/bluetooth/bsim/host/gatt/notify/src/common.h b/tests/bsim/bluetooth/host/gatt/notify/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/src/common.h rename to tests/bsim/bluetooth/host/gatt/notify/src/common.h diff --git a/tests/bluetooth/bsim/host/gatt/notify/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/src/gatt_client_test.c rename to tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c diff --git a/tests/bluetooth/bsim/host/gatt/notify/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/src/gatt_server_test.c rename to tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c diff --git a/tests/bluetooth/bsim/host/gatt/notify/src/main.c b/tests/bsim/bluetooth/host/gatt/notify/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/src/main.c rename to tests/bsim/bluetooth/host/gatt/notify/src/main.c diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh similarity index 87% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/_run_test.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh index 6229a794db6..bd79acb3fdd 100755 --- a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/_run_test.sh +++ b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh @@ -23,10 +23,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_notify_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_notify_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_enhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_enhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_enhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_enhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_mixed.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_mixed.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_mixed.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_mixed.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_none.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_none.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_none.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_none.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_unenhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_unenhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_enhanced_unenhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_enhanced_unenhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_enhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_enhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_enhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_enhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_mixed.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_mixed.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_mixed.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_mixed.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_none.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_none.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_none.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_none.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_unenhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_unenhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_mixed_unenhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_mixed_unenhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_enhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_enhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_enhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_enhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_mixed.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_mixed.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_mixed.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_mixed.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_none.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_none.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_none.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_none.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_unenhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_unenhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_none_unenhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_none_unenhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_enhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_enhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_enhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_enhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_mixed.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_mixed.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_mixed.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_mixed.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_none.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_none.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_none.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_none.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_unenhanced.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_unenhanced.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify/test_scripts/gatt_notify_unenhanced_unenhanced.sh rename to tests/bsim/bluetooth/host/gatt/notify/test_scripts/gatt_notify_unenhanced_unenhanced.sh diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/CMakeLists.txt rename to tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/prj.conf b/tests/bsim/bluetooth/host/gatt/notify_multiple/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/prj.conf rename to tests/bsim/bluetooth/host/gatt/notify_multiple/prj.conf diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/src/common.c b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/src/common.c rename to tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.c diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/src/common.h b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/src/common.h rename to tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.h diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_client_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/src/gatt_client_test.c rename to tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_client_test.c diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_server_test.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/src/gatt_server_test.c rename to tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_server_test.c diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/src/main.c b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/src/main.c rename to tests/bsim/bluetooth/host/gatt/notify_multiple/src/main.c diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/test_scripts/_notify-debug.sh b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/_notify-debug.sh similarity index 88% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/test_scripts/_notify-debug.sh rename to tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/_notify-debug.sh index f8adec17950..29ac8e41794 100755 --- a/tests/bluetooth/bsim/host/gatt/notify_multiple/test_scripts/_notify-debug.sh +++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/_notify-debug.sh @@ -28,11 +28,11 @@ if [[ $2 == "debug" ]]; then fi if [[ $1 == "client" ]]; then -$GDB_P ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_notify_multiple_prj_conf \ +$GDB_P ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client elif [[ $1 == "server" ]]; then -$GDB_P ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_notify_multiple_prj_conf \ +$GDB_P ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server else diff --git a/tests/bluetooth/bsim/host/gatt/notify_multiple/test_scripts/notify.sh b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh similarity index 88% rename from tests/bluetooth/bsim/host/gatt/notify_multiple/test_scripts/notify.sh rename to tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh index b70d41ebdf0..ee243473bea 100755 --- a/tests/bluetooth/bsim/host/gatt/notify_multiple/test_scripts/notify.sh +++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh @@ -22,10 +22,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_notify_multiple_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_notify_multiple_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/gatt/settings/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/CMakeLists.txt rename to tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/gatt/settings/prj.conf b/tests/bsim/bluetooth/host/gatt/settings/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/prj.conf rename to tests/bsim/bluetooth/host/gatt/settings/prj.conf diff --git a/tests/bluetooth/bsim/host/gatt/settings/prj_2.conf b/tests/bsim/bluetooth/host/gatt/settings/prj_2.conf similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/prj_2.conf rename to tests/bsim/bluetooth/host/gatt/settings/prj_2.conf diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/client.c b/tests/bsim/bluetooth/host/gatt/settings/src/client.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/client.c rename to tests/bsim/bluetooth/host/gatt/settings/src/client.c diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/gatt_utils.c b/tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/gatt_utils.c rename to tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.c diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/gatt_utils.h b/tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.h similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/gatt_utils.h rename to tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.h diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/main.c b/tests/bsim/bluetooth/host/gatt/settings/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/main.c rename to tests/bsim/bluetooth/host/gatt/settings/src/main.c diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/main.h b/tests/bsim/bluetooth/host/gatt/settings/src/main.h similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/main.h rename to tests/bsim/bluetooth/host/gatt/settings/src/main.h diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/server.c b/tests/bsim/bluetooth/host/gatt/settings/src/server.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/server.c rename to tests/bsim/bluetooth/host/gatt/settings/src/server.c diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/settings.c b/tests/bsim/bluetooth/host/gatt/settings/src/settings.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/settings.c rename to tests/bsim/bluetooth/host/gatt/settings/src/settings.c diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/utils.c b/tests/bsim/bluetooth/host/gatt/settings/src/utils.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/utils.c rename to tests/bsim/bluetooth/host/gatt/settings/src/utils.c diff --git a/tests/bluetooth/bsim/host/gatt/settings/src/utils.h b/tests/bsim/bluetooth/host/gatt/settings/src/utils.h similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/src/utils.h rename to tests/bsim/bluetooth/host/gatt/settings/src/utils.h diff --git a/tests/bluetooth/bsim/host/gatt/settings/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh diff --git a/tests/bluetooth/bsim/host/gatt/settings/test_scripts/_env.sh b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/_env.sh similarity index 75% rename from tests/bluetooth/bsim/host/gatt/settings/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/gatt/settings/test_scripts/_env.sh index aba0945a3c4..348f8ec6d42 100755 --- a/tests/bluetooth/bsim/host/gatt/settings/test_scripts/_env.sh +++ b/tests/bsim/bluetooth/host/gatt/settings/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_gatt_settings_prj_conf" -test_2_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_gatt_settings_prj_2_conf" +test_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_gatt_settings_prj_conf" +test_2_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_gatt_settings_prj_2_conf" diff --git a/tests/bluetooth/bsim/host/gatt/settings/test_scripts/run_gatt_settings.sh b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/test_scripts/run_gatt_settings.sh rename to tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings.sh diff --git a/tests/bluetooth/bsim/host/gatt/settings/test_scripts/run_gatt_settings_2.sh b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_2.sh similarity index 100% rename from tests/bluetooth/bsim/host/gatt/settings/test_scripts/run_gatt_settings_2.sh rename to tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_2.sh diff --git a/tests/bluetooth/bsim/host/gatt/write/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/write/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/gatt/write/CMakeLists.txt rename to tests/bsim/bluetooth/host/gatt/write/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/gatt/write/prj.conf b/tests/bsim/bluetooth/host/gatt/write/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/gatt/write/prj.conf rename to tests/bsim/bluetooth/host/gatt/write/prj.conf diff --git a/tests/bluetooth/bsim/host/gatt/write/src/main.c b/tests/bsim/bluetooth/host/gatt/write/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/gatt/write/src/main.c rename to tests/bsim/bluetooth/host/gatt/write/src/main.c diff --git a/tests/bluetooth/bsim/host/gatt/write/tests_scripts/gatt_write.sh b/tests/bsim/bluetooth/host/gatt/write/tests_scripts/gatt_write.sh similarity index 88% rename from tests/bluetooth/bsim/host/gatt/write/tests_scripts/gatt_write.sh rename to tests/bsim/bluetooth/host/gatt/write/tests_scripts/gatt_write.sh index 3f087de656f..30c05ea3a8a 100755 --- a/tests/bluetooth/bsim/host/gatt/write/tests_scripts/gatt_write.sh +++ b/tests/bsim/bluetooth/host/gatt/write/tests_scripts/gatt_write.sh @@ -23,10 +23,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_write_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_write_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_gatt_write_prj_conf\ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_gatt_write_prj_conf\ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/l2cap/general/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/general/CMakeLists.txt rename to tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/l2cap/general/prj.conf b/tests/bsim/bluetooth/host/l2cap/general/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/general/prj.conf rename to tests/bsim/bluetooth/host/l2cap/general/prj.conf diff --git a/tests/bluetooth/bsim/host/l2cap/general/src/common.c b/tests/bsim/bluetooth/host/l2cap/general/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/general/src/common.c rename to tests/bsim/bluetooth/host/l2cap/general/src/common.c diff --git a/tests/bluetooth/bsim/host/l2cap/general/src/common.h b/tests/bsim/bluetooth/host/l2cap/general/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/general/src/common.h rename to tests/bsim/bluetooth/host/l2cap/general/src/common.h diff --git a/tests/bluetooth/bsim/host/l2cap/general/src/main.c b/tests/bsim/bluetooth/host/l2cap/general/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/general/src/main.c rename to tests/bsim/bluetooth/host/l2cap/general/src/main.c diff --git a/tests/bluetooth/bsim/host/l2cap/general/src/main_l2cap_ecred.c b/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/general/src/main_l2cap_ecred.c rename to tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c diff --git a/tests/bluetooth/bsim/host/l2cap/general/tests_scripts/l2cap.sh b/tests/bsim/bluetooth/host/l2cap/general/tests_scripts/l2cap.sh similarity index 88% rename from tests/bluetooth/bsim/host/l2cap/general/tests_scripts/l2cap.sh rename to tests/bsim/bluetooth/host/l2cap/general/tests_scripts/l2cap.sh index 16f33b90595..54cf6c75615 100755 --- a/tests/bluetooth/bsim/host/l2cap/general/tests_scripts/l2cap.sh +++ b/tests/bsim/bluetooth/host/l2cap/general/tests_scripts/l2cap.sh @@ -23,10 +23,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_l2cap_general_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_l2cap_general_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -rs=43 -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_l2cap_general_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_l2cap_general_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -rs=42 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/l2cap/stress/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/stress/CMakeLists.txt rename to tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/l2cap/stress/prj.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/stress/prj.conf rename to tests/bsim/bluetooth/host/l2cap/stress/prj.conf diff --git a/tests/bluetooth/bsim/host/l2cap/stress/src/common.c b/tests/bsim/bluetooth/host/l2cap/stress/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/stress/src/common.c rename to tests/bsim/bluetooth/host/l2cap/stress/src/common.c diff --git a/tests/bluetooth/bsim/host/l2cap/stress/src/common.h b/tests/bsim/bluetooth/host/l2cap/stress/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/stress/src/common.h rename to tests/bsim/bluetooth/host/l2cap/stress/src/common.h diff --git a/tests/bluetooth/bsim/host/l2cap/stress/src/main.c b/tests/bsim/bluetooth/host/l2cap/stress/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/stress/src/main.c rename to tests/bsim/bluetooth/host/l2cap/stress/src/main.c diff --git a/tests/bluetooth/bsim/host/l2cap/stress/tests_scripts/l2cap.sh b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap.sh similarity index 95% rename from tests/bluetooth/bsim/host/l2cap/stress/tests_scripts/l2cap.sh rename to tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap.sh index adb71fc3378..e556fad38e2 100755 --- a/tests/bluetooth/bsim/host/l2cap/stress/tests_scripts/l2cap.sh +++ b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap.sh @@ -24,7 +24,7 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -bsim_exe=./bs_${BOARD}_tests_bluetooth_bsim_host_l2cap_stress_prj_conf +bsim_exe=./bs_${BOARD}_tests_bsim_bluetooth_host_l2cap_stress_prj_conf Execute "${bsim_exe}" -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -rs=43 diff --git a/tests/bluetooth/bsim/host/l2cap/userdata/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/userdata/CMakeLists.txt rename to tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/l2cap/userdata/prj.conf b/tests/bsim/bluetooth/host/l2cap/userdata/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/userdata/prj.conf rename to tests/bsim/bluetooth/host/l2cap/userdata/prj.conf diff --git a/tests/bluetooth/bsim/host/l2cap/userdata/src/common.c b/tests/bsim/bluetooth/host/l2cap/userdata/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/userdata/src/common.c rename to tests/bsim/bluetooth/host/l2cap/userdata/src/common.c diff --git a/tests/bluetooth/bsim/host/l2cap/userdata/src/common.h b/tests/bsim/bluetooth/host/l2cap/userdata/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/userdata/src/common.h rename to tests/bsim/bluetooth/host/l2cap/userdata/src/common.h diff --git a/tests/bluetooth/bsim/host/l2cap/userdata/src/main.c b/tests/bsim/bluetooth/host/l2cap/userdata/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/userdata/src/main.c rename to tests/bsim/bluetooth/host/l2cap/userdata/src/main.c diff --git a/tests/bluetooth/bsim/host/l2cap/userdata/src/main_l2cap_userdata.c b/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c similarity index 100% rename from tests/bluetooth/bsim/host/l2cap/userdata/src/main_l2cap_userdata.c rename to tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c diff --git a/tests/bluetooth/bsim/host/l2cap/userdata/tests_scripts/l2cap.sh b/tests/bsim/bluetooth/host/l2cap/userdata/tests_scripts/l2cap.sh similarity index 88% rename from tests/bluetooth/bsim/host/l2cap/userdata/tests_scripts/l2cap.sh rename to tests/bsim/bluetooth/host/l2cap/userdata/tests_scripts/l2cap.sh index 45a84515151..05637864fe6 100755 --- a/tests/bluetooth/bsim/host/l2cap/userdata/tests_scripts/l2cap.sh +++ b/tests/bsim/bluetooth/host/l2cap/userdata/tests_scripts/l2cap.sh @@ -24,10 +24,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_l2cap_userdata_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_l2cap_userdata_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_l2cap_userdata_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_l2cap_userdata_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/misc/disable/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/CMakeLists.txt rename to tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/misc/disable/prj.conf b/tests/bsim/bluetooth/host/misc/disable/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/prj.conf rename to tests/bsim/bluetooth/host/misc/disable/prj.conf diff --git a/tests/bluetooth/bsim/host/misc/disable/src/common.c b/tests/bsim/bluetooth/host/misc/disable/src/common.c similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/src/common.c rename to tests/bsim/bluetooth/host/misc/disable/src/common.c diff --git a/tests/bluetooth/bsim/host/misc/disable/src/common.h b/tests/bsim/bluetooth/host/misc/disable/src/common.h similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/src/common.h rename to tests/bsim/bluetooth/host/misc/disable/src/common.h diff --git a/tests/bluetooth/bsim/host/misc/disable/src/gatt_client_test.c b/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/src/gatt_client_test.c rename to tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c diff --git a/tests/bluetooth/bsim/host/misc/disable/src/gatt_server_test.c b/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/src/gatt_server_test.c rename to tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c diff --git a/tests/bluetooth/bsim/host/misc/disable/src/main.c b/tests/bsim/bluetooth/host/misc/disable/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/src/main.c rename to tests/bsim/bluetooth/host/misc/disable/src/main.c diff --git a/tests/bluetooth/bsim/host/misc/disable/src/main_disable.c b/tests/bsim/bluetooth/host/misc/disable/src/main_disable.c similarity index 100% rename from tests/bluetooth/bsim/host/misc/disable/src/main_disable.c rename to tests/bsim/bluetooth/host/misc/disable/src/main_disable.c diff --git a/tests/bluetooth/bsim/host/misc/disable/tests_scripts/disable.sh b/tests/bsim/bluetooth/host/misc/disable/tests_scripts/disable.sh similarity index 93% rename from tests/bluetooth/bsim/host/misc/disable/tests_scripts/disable.sh rename to tests/bsim/bluetooth/host/misc/disable/tests_scripts/disable.sh index 9ee0539fd26..b3e390f82d5 100755 --- a/tests/bluetooth/bsim/host/misc/disable/tests_scripts/disable.sh +++ b/tests/bsim/bluetooth/host/misc/disable/tests_scripts/disable.sh @@ -23,7 +23,7 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_misc_disable_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_misc_disable_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=disable Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/misc/disable/tests_scripts/disable_with_gatt.sh b/tests/bsim/bluetooth/host/misc/disable/tests_scripts/disable_with_gatt.sh similarity index 90% rename from tests/bluetooth/bsim/host/misc/disable/tests_scripts/disable_with_gatt.sh rename to tests/bsim/bluetooth/host/misc/disable/tests_scripts/disable_with_gatt.sh index 847718012a6..fef45b2f61d 100755 --- a/tests/bluetooth/bsim/host/misc/disable/tests_scripts/disable_with_gatt.sh +++ b/tests/bsim/bluetooth/host/misc/disable/tests_scripts/disable_with_gatt.sh @@ -26,10 +26,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_misc_disable_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_misc_disable_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_misc_disable_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_misc_disable_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/misc/multiple_id/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/multiple_id/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/misc/multiple_id/CMakeLists.txt rename to tests/bsim/bluetooth/host/misc/multiple_id/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/misc/multiple_id/prj.conf b/tests/bsim/bluetooth/host/misc/multiple_id/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/misc/multiple_id/prj.conf rename to tests/bsim/bluetooth/host/misc/multiple_id/prj.conf diff --git a/tests/bluetooth/bsim/host/misc/multiple_id/src/main.c b/tests/bsim/bluetooth/host/misc/multiple_id/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/misc/multiple_id/src/main.c rename to tests/bsim/bluetooth/host/misc/multiple_id/src/main.c diff --git a/tests/bluetooth/bsim/host/misc/multiple_id/tests_scripts/multiple.sh b/tests/bsim/bluetooth/host/misc/multiple_id/tests_scripts/multiple.sh similarity index 88% rename from tests/bluetooth/bsim/host/misc/multiple_id/tests_scripts/multiple.sh rename to tests/bsim/bluetooth/host/misc/multiple_id/tests_scripts/multiple.sh index 37c6d382593..e8c24354d05 100755 --- a/tests/bluetooth/bsim/host/misc/multiple_id/tests_scripts/multiple.sh +++ b/tests/bsim/bluetooth/host/misc/multiple_id/tests_scripts/multiple.sh @@ -23,10 +23,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_misc_multiple_id_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_misc_multiple_id_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -Execute ./bs_${BOARD}_tests_bluetooth_bsim_host_misc_multiple_id_prj_conf\ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_host_misc_multiple_id_prj_conf\ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/host/privacy/central/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/CMakeLists.txt rename to tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/privacy/central/prj.conf b/tests/bsim/bluetooth/host/privacy/central/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/prj.conf rename to tests/bsim/bluetooth/host/privacy/central/prj.conf diff --git a/tests/bluetooth/bsim/host/privacy/central/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/src/bs_bt_utils.c rename to tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.c diff --git a/tests/bluetooth/bsim/host/privacy/central/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.h similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/src/bs_bt_utils.h rename to tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.h diff --git a/tests/bluetooth/bsim/host/privacy/central/src/dut.c b/tests/bsim/bluetooth/host/privacy/central/src/dut.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/src/dut.c rename to tests/bsim/bluetooth/host/privacy/central/src/dut.c diff --git a/tests/bluetooth/bsim/host/privacy/central/src/main.c b/tests/bsim/bluetooth/host/privacy/central/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/src/main.c rename to tests/bsim/bluetooth/host/privacy/central/src/main.c diff --git a/tests/bluetooth/bsim/host/privacy/central/src/tester.c b/tests/bsim/bluetooth/host/privacy/central/src/tester.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/src/tester.c rename to tests/bsim/bluetooth/host/privacy/central/src/tester.c diff --git a/tests/bluetooth/bsim/host/privacy/central/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh diff --git a/tests/bluetooth/bsim/host/privacy/central/test_scripts/_env.sh b/tests/bsim/bluetooth/host/privacy/central/test_scripts/_env.sh similarity index 92% rename from tests/bluetooth/bsim/host/privacy/central/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/privacy/central/test_scripts/_env.sh index a196afdadeb..44e2f07ee4c 100755 --- a/tests/bluetooth/bsim/host/privacy/central/test_scripts/_env.sh +++ b/tests/bsim/bluetooth/host/privacy/central/test_scripts/_env.sh @@ -12,7 +12,7 @@ bsim_bin="${BSIM_OUT_PATH}/bin" verbosity_level=2 BOARD="${BOARD:-nrf52_bsim}" simulation_id="$test_name" -central_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_privacy_central_prj_conf" +central_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_privacy_central_prj_conf" peripheral_exe="${central_exe}" function print_var { diff --git a/tests/bluetooth/bsim/host/privacy/central/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/privacy/central/test_scripts/run_test.sh similarity index 100% rename from tests/bluetooth/bsim/host/privacy/central/test_scripts/run_test.sh rename to tests/bsim/bluetooth/host/privacy/central/test_scripts/run_test.sh diff --git a/tests/bluetooth/bsim/host/privacy/device/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/CMakeLists.txt rename to tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/privacy/device/README.rst b/tests/bsim/bluetooth/host/privacy/device/README.rst similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/README.rst rename to tests/bsim/bluetooth/host/privacy/device/README.rst diff --git a/tests/bluetooth/bsim/host/privacy/device/prj.conf b/tests/bsim/bluetooth/host/privacy/device/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/prj.conf rename to tests/bsim/bluetooth/host/privacy/device/prj.conf diff --git a/tests/bluetooth/bsim/host/privacy/device/src/test_undirected_central.c b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_central.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/src/test_undirected_central.c rename to tests/bsim/bluetooth/host/privacy/device/src/test_undirected_central.c diff --git a/tests/bluetooth/bsim/host/privacy/device/src/test_undirected_main.c b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_main.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/src/test_undirected_main.c rename to tests/bsim/bluetooth/host/privacy/device/src/test_undirected_main.c diff --git a/tests/bluetooth/bsim/host/privacy/device/src/test_undirected_peripheral.c b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_peripheral.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/src/test_undirected_peripheral.c rename to tests/bsim/bluetooth/host/privacy/device/src/test_undirected_peripheral.c diff --git a/tests/bluetooth/bsim/host/privacy/device/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh diff --git a/tests/bluetooth/bsim/host/privacy/device/test_scripts/_env.sh b/tests/bsim/bluetooth/host/privacy/device/test_scripts/_env.sh similarity index 86% rename from tests/bluetooth/bsim/host/privacy/device/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/privacy/device/test_scripts/_env.sh index 0b4455c9251..bb1b50678cc 100755 --- a/tests/bluetooth/bsim/host/privacy/device/test_scripts/_env.sh +++ b/tests/bsim/bluetooth/host/privacy/device/test_scripts/_env.sh @@ -12,4 +12,4 @@ bsim_bin="${BSIM_OUT_PATH}/bin" verbosity_level=2 BOARD="${BOARD:-nrf52_bsim}" simulation_id="$test_name" -test_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_privacy_device_prj_conf" +test_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_privacy_device_prj_conf" diff --git a/tests/bluetooth/bsim/host/privacy/device/test_scripts/run_tests.sh b/tests/bsim/bluetooth/host/privacy/device/test_scripts/run_tests.sh similarity index 100% rename from tests/bluetooth/bsim/host/privacy/device/test_scripts/run_tests.sh rename to tests/bsim/bluetooth/host/privacy/device/test_scripts/run_tests.sh diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/CMakeLists.txt rename to tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/prj.conf b/tests/bsim/bluetooth/host/privacy/peripheral/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/prj.conf rename to tests/bsim/bluetooth/host/privacy/peripheral/prj.conf diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/src/bs_bt_utils.c rename to tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.c diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.h similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/src/bs_bt_utils.h rename to tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.h diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/src/dut.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/src/dut.c rename to tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/src/main.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/src/main.c rename to tests/bsim/bluetooth/host/privacy/peripheral/src/main.c diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/src/tester.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester.c similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/src/tester.c rename to tests/bsim/bluetooth/host/privacy/peripheral/src/tester.c diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/test_scripts/_env.sh b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_env.sh similarity index 92% rename from tests/bluetooth/bsim/host/privacy/peripheral/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_env.sh index 9731c7178f5..ac2d2d5888e 100755 --- a/tests/bluetooth/bsim/host/privacy/peripheral/test_scripts/_env.sh +++ b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_env.sh @@ -12,7 +12,7 @@ bsim_bin="${BSIM_OUT_PATH}/bin" verbosity_level=2 BOARD="${BOARD:-nrf52_bsim}" simulation_id="$test_name" -central_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_privacy_peripheral_prj_conf" +central_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_privacy_peripheral_prj_conf" peripheral_exe="${central_exe}" function print_var { diff --git a/tests/bluetooth/bsim/host/privacy/peripheral/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test.sh similarity index 100% rename from tests/bluetooth/bsim/host/privacy/peripheral/test_scripts/run_test.sh rename to tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test.sh diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/CMakeLists.txt b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/CMakeLists.txt rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/prj.conf b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/prj.conf rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/prj.conf diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/bs_bt_utils.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/bs_bt_utils.h rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/central.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/central.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/main.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/main.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/main.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/src/peripheral.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh similarity index 84% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh index 7792a05565c..8a431f173c6 100755 --- a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh @@ -18,5 +18,5 @@ BOARD="${BOARD:-nrf52_bsim}" BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" INCR_BUILD=1 mkdir -p ${WORK_DIR} -source ${ZEPHYR_BASE}/tests/bluetooth/bsim/compile.source -app="tests/bluetooth/bsim/$test_name" compile +source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source +app="tests/bsim/bluetooth/$test_name" compile diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/_env.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_env.sh similarity index 92% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_env.sh index 4f2af986704..f0005e331cc 100755 --- a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/_env.sh +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_env.sh @@ -11,7 +11,7 @@ bsim_bin="${BSIM_OUT_PATH}/bin" verbosity_level=2 BOARD="${BOARD:-nrf52_bsim}" simulation_id="$test_name" -central_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_${test_name}_prj_conf" +central_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_${test_name}_prj_conf" peripheral_exe="${central_exe}" function print_var { diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/run_test.sh similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_allowed/test_scripts/run_test.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/run_test.sh diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/CMakeLists.txt b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/CMakeLists.txt rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/prj.conf b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/prj.conf similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/prj.conf rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/prj.conf diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/bs_bt_utils.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/bs_bt_utils.h rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/central.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/central.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/main.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/main.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/main.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/main.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/src/peripheral.c rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh similarity index 84% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh index 7792a05565c..8a431f173c6 100755 --- a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh @@ -18,5 +18,5 @@ BOARD="${BOARD:-nrf52_bsim}" BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" INCR_BUILD=1 mkdir -p ${WORK_DIR} -source ${ZEPHYR_BASE}/tests/bluetooth/bsim/compile.source -app="tests/bluetooth/bsim/$test_name" compile +source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source +app="tests/bsim/bluetooth/$test_name" compile diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/_env.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_env.sh similarity index 92% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/_env.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_env.sh index 3097cb4bc17..982ba75d4f5 100755 --- a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/_env.sh +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_env.sh @@ -11,7 +11,7 @@ bsim_bin="${BSIM_OUT_PATH}/bin" verbosity_level=2 BOARD="${BOARD:-nrf52_bsim}" simulation_id="$test_name" -central_exe="${bsim_bin}/bs_${BOARD}_tests_bluetooth_bsim_host_${test_name}_prj_conf" +central_exe="${bsim_bin}/bs_${BOARD}_tests_bsim_bluetooth_host_${test_name}_prj_conf" peripheral_exe="${central_exe}" function print_var { diff --git a/tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/run_test.sh similarity index 100% rename from tests/bluetooth/bsim/host/security/bond_overwrite_denied/test_scripts/run_test.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/run_test.sh diff --git a/tests/bluetooth/bsim/ll/advx/CMakeLists.txt b/tests/bsim/bluetooth/ll/advx/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/ll/advx/CMakeLists.txt rename to tests/bsim/bluetooth/ll/advx/CMakeLists.txt diff --git a/tests/bluetooth/bsim/ll/advx/prj.conf b/tests/bsim/bluetooth/ll/advx/prj.conf similarity index 100% rename from tests/bluetooth/bsim/ll/advx/prj.conf rename to tests/bsim/bluetooth/ll/advx/prj.conf diff --git a/tests/bluetooth/bsim/ll/advx/src/main.c b/tests/bsim/bluetooth/ll/advx/src/main.c similarity index 100% rename from tests/bluetooth/bsim/ll/advx/src/main.c rename to tests/bsim/bluetooth/ll/advx/src/main.c diff --git a/tests/bluetooth/bsim/ll/advx/tests_scripts/basic_advx.sh b/tests/bsim/bluetooth/ll/advx/tests_scripts/basic_advx.sh similarity index 89% rename from tests/bluetooth/bsim/ll/advx/tests_scripts/basic_advx.sh rename to tests/bsim/bluetooth/ll/advx/tests_scripts/basic_advx.sh index 5379d8bf700..056378febf3 100755 --- a/tests/bluetooth/bsim/ll/advx/tests_scripts/basic_advx.sh +++ b/tests/bsim/bluetooth/ll/advx/tests_scripts/basic_advx.sh @@ -24,10 +24,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_advx_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_advx_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=advx -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_advx_prj_conf\ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_advx_prj_conf\ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=scanx Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/ll/compile.sh b/tests/bsim/bluetooth/ll/compile.sh similarity index 57% rename from tests/bluetooth/bsim/ll/compile.sh rename to tests/bsim/bluetooth/ll/compile.sh index f9d6f762414..fcc36122956 100755 --- a/tests/bluetooth/bsim/ll/compile.sh +++ b/tests/bsim/bluetooth/ll/compile.sh @@ -18,22 +18,22 @@ 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/ll/advx compile +app=tests/bsim/bluetooth/ll/advx compile -app=tests/bluetooth/bsim/ll/conn conf_file=prj_split.conf compile -app=tests/bluetooth/bsim/ll/conn conf_file=prj_split_privacy.conf compile -app=tests/bluetooth/bsim/ll/conn conf_file=prj_split_low_lat.conf compile +app=tests/bsim/bluetooth/ll/conn conf_file=prj_split.conf compile +app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_privacy.conf compile +app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_low_lat.conf compile -app=tests/bluetooth/bsim/ll/iso compile -app=tests/bluetooth/bsim/ll/iso conf_file=prj_vs_dp.conf compile +app=tests/bsim/bluetooth/ll/iso compile +app=tests/bsim/bluetooth/ll/iso conf_file=prj_vs_dp.conf compile -app=tests/bluetooth/bsim/ll/edtt/hci_test_app \ +app=tests/bsim/bluetooth/ll/edtt/hci_test_app \ conf_file=prj_dut_llcp.conf compile -app=tests/bluetooth/bsim/ll/edtt/hci_test_app \ +app=tests/bsim/bluetooth/ll/edtt/hci_test_app \ conf_file=prj_tst_llcp.conf compile -app=tests/bluetooth/bsim/ll/edtt/gatt_test_app \ +app=tests/bsim/bluetooth/ll/edtt/gatt_test_app \ conf_file=prj_llcp.conf compile wait_for_background_jobs diff --git a/tests/bluetooth/bsim/ll/conn/CMakeLists.txt b/tests/bsim/bluetooth/ll/conn/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/ll/conn/CMakeLists.txt rename to tests/bsim/bluetooth/ll/conn/CMakeLists.txt diff --git a/tests/bluetooth/bsim/ll/conn/README.txt b/tests/bsim/bluetooth/ll/conn/README.txt similarity index 100% rename from tests/bluetooth/bsim/ll/conn/README.txt rename to tests/bsim/bluetooth/ll/conn/README.txt diff --git a/tests/bluetooth/bsim/ll/conn/prj_split.conf b/tests/bsim/bluetooth/ll/conn/prj_split.conf similarity index 100% rename from tests/bluetooth/bsim/ll/conn/prj_split.conf rename to tests/bsim/bluetooth/ll/conn/prj_split.conf diff --git a/tests/bluetooth/bsim/ll/conn/prj_split_low_lat.conf b/tests/bsim/bluetooth/ll/conn/prj_split_low_lat.conf similarity index 100% rename from tests/bluetooth/bsim/ll/conn/prj_split_low_lat.conf rename to tests/bsim/bluetooth/ll/conn/prj_split_low_lat.conf diff --git a/tests/bluetooth/bsim/ll/conn/prj_split_privacy.conf b/tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf similarity index 100% rename from tests/bluetooth/bsim/ll/conn/prj_split_privacy.conf rename to tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf diff --git a/tests/bluetooth/bsim/ll/conn/src/main.c b/tests/bsim/bluetooth/ll/conn/src/main.c similarity index 100% rename from tests/bluetooth/bsim/ll/conn/src/main.c rename to tests/bsim/bluetooth/ll/conn/src/main.c diff --git a/tests/bluetooth/bsim/ll/conn/src/test_connect1.c b/tests/bsim/bluetooth/ll/conn/src/test_connect1.c similarity index 100% rename from tests/bluetooth/bsim/ll/conn/src/test_connect1.c rename to tests/bsim/bluetooth/ll/conn/src/test_connect1.c diff --git a/tests/bluetooth/bsim/ll/conn/src/test_connect2.c b/tests/bsim/bluetooth/ll/conn/src/test_connect2.c similarity index 100% rename from tests/bluetooth/bsim/ll/conn/src/test_connect2.c rename to tests/bsim/bluetooth/ll/conn/src/test_connect2.c diff --git a/tests/bluetooth/bsim/ll/conn/src/test_empty.c b/tests/bsim/bluetooth/ll/conn/src/test_empty.c similarity index 100% rename from tests/bluetooth/bsim/ll/conn/src/test_empty.c rename to tests/bsim/bluetooth/ll/conn/src/test_empty.c diff --git a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_encrypted_split.sh b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_encrypted_split.sh similarity index 89% rename from tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_encrypted_split.sh rename to tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_encrypted_split.sh index 460d46a8e4f..c2bf39cac13 100755 --- a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_encrypted_split.sh +++ b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_encrypted_split.sh @@ -24,11 +24,11 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=1 \ -testid=peripheral -rs=23 -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=1 \ -testid=central_encrypted -rs=6 diff --git a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh similarity index 89% rename from tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh rename to tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh index 09a4e14e070..7062aaeab47 100755 --- a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh +++ b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh @@ -25,12 +25,12 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin Execute \ - ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_privacy_conf \ + ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_privacy_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=1 \ -testid=peripheral -rs=23 Execute \ - ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_privacy_conf \ + ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_privacy_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=1 \ -testid=central_encrypted -rs=6 diff --git a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_split.sh b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split.sh similarity index 89% rename from tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_split.sh rename to tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split.sh index bd70e2c4767..1106e44ca5c 100755 --- a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_split.sh +++ b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split.sh @@ -24,11 +24,11 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \ -testid=peripheral -rs=23 -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_conf\ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_conf\ -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \ -testid=central -rs=6 diff --git a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_split_low_lat.sh b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split_low_lat.sh similarity index 89% rename from tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_split_low_lat.sh rename to tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split_low_lat.sh index f4ce0fc9b23..a3fa4abd146 100755 --- a/tests/bluetooth/bsim/ll/conn/tests_scripts/basic_conn_split_low_lat.sh +++ b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split_low_lat.sh @@ -25,12 +25,12 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin Execute \ - ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_low_lat_conf \ + ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_low_lat_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \ -testid=peripheral -rs=23 Execute \ - ./bs_${BOARD}_tests_bluetooth_bsim_ll_conn_prj_split_low_lat_conf \ + ./bs_${BOARD}_tests_bsim_bluetooth_ll_conn_prj_split_low_lat_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \ -testid=central -rs=6 diff --git a/tests/bluetooth/bsim/ll/edtt/README.txt b/tests/bsim/bluetooth/ll/edtt/README.txt similarity index 89% rename from tests/bluetooth/bsim/ll/edtt/README.txt rename to tests/bsim/bluetooth/ll/edtt/README.txt index dfb31709fc7..104662dc4ca 100644 --- a/tests/bluetooth/bsim/ll/edtt/README.txt +++ b/tests/bsim/bluetooth/ll/edtt/README.txt @@ -53,11 +53,11 @@ In short the whole process being: ``` cd ${ZEPHYR_BASE} && source zephyr-env.sh #Compile all apps: -WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim/compile.sh +WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/bluetooth/compile.sh #run all tests -RESULTS_FILE=${ZEPHYR_BASE}/banana.xml SEARCH_PATH=tests/bluetooth/bsim/ll/edtt/ tests/bluetooth/bsim/run_parallel.sh +RESULTS_FILE=${ZEPHYR_BASE}/banana.xml SEARCH_PATH=tests/bsim/bluetooth/ll/edtt/ tests/bsim/bluetooth/run_parallel.sh #or just run one set: -tests/bluetooth/bsim/ll/edtt/tests_scripts/hci.sh +tests/bsim/bluetooth/ll/edtt/tests_scripts/hci.sh ``` diff --git a/tests/bluetooth/bsim/ll/edtt/common/commands.h b/tests/bsim/bluetooth/ll/edtt/common/commands.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/common/commands.h rename to tests/bsim/bluetooth/ll/edtt/common/commands.h diff --git a/tests/bluetooth/bsim/ll/edtt/common/edtt_driver.h b/tests/bsim/bluetooth/ll/edtt/common/edtt_driver.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/common/edtt_driver.h rename to tests/bsim/bluetooth/ll/edtt/common/edtt_driver.h diff --git a/tests/bluetooth/bsim/ll/edtt/common/edtt_driver_bsim.c b/tests/bsim/bluetooth/ll/edtt/common/edtt_driver_bsim.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/common/edtt_driver_bsim.c rename to tests/bsim/bluetooth/ll/edtt/common/edtt_driver_bsim.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/CMakeLists.txt b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/CMakeLists.txt rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/CMakeLists.txt diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/prj_llcp.conf b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/prj_llcp.conf similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/prj_llcp.conf rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/prj_llcp.conf diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_a_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_d_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_2.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_2.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_2.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_2.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_2.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_2.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_2.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_3.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_3.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_3.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_3.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_3.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_e_3.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_e_3.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_f_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_f_1.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.c diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_f_1.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/service_f_1.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/services.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/services.h similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/gatt/services.h rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/services.h diff --git a/tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/main.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/main.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/gatt_test_app/src/main.c rename to tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/main.c diff --git a/tests/bluetooth/bsim/ll/edtt/hci_test_app/CMakeLists.txt b/tests/bsim/bluetooth/ll/edtt/hci_test_app/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/hci_test_app/CMakeLists.txt rename to tests/bsim/bluetooth/ll/edtt/hci_test_app/CMakeLists.txt diff --git a/tests/bluetooth/bsim/ll/edtt/hci_test_app/prj_dut_llcp.conf b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/hci_test_app/prj_dut_llcp.conf rename to tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf diff --git a/tests/bluetooth/bsim/ll/edtt/hci_test_app/prj_tst_llcp.conf b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/hci_test_app/prj_tst_llcp.conf rename to tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf diff --git a/tests/bluetooth/bsim/ll/edtt/hci_test_app/src/main.c b/tests/bsim/bluetooth/ll/edtt/hci_test_app/src/main.c similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/hci_test_app/src/main.c rename to tests/bsim/bluetooth/ll/edtt/hci_test_app/src/main.c diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/_controller_tests_inner.sh b/tests/bsim/bluetooth/ll/edtt/tests_scripts/_controller_tests_inner.sh similarity index 96% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/_controller_tests_inner.sh rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/_controller_tests_inner.sh index 440f2039b08..a7b0592b22a 100755 --- a/tests/bluetooth/bsim/ll/edtt/tests_scripts/_controller_tests_inner.sh +++ b/tests/bsim/bluetooth/ll/edtt/tests_scripts/_controller_tests_inner.sh @@ -101,11 +101,11 @@ Execute ./src/edttool.py -s=${SIMULATION_ID} -d=2 --transport bsim \ cd ${BSIM_OUT_PATH}/bin Execute \ - ${RR_ARGS_1} ./bs_${BOARD}_tests_bluetooth_bsim_ll_edtt_hci_test_app_${PRJ_CONF_1}\ + ${RR_ARGS_1} ./bs_${BOARD}_tests_bsim_bluetooth_ll_edtt_hci_test_app_${PRJ_CONF_1}\ -s=${SIMULATION_ID} -d=0 -v=${VERBOSITY_LEVEL_DEV1} -RealEncryption=1 Execute \ - ${RR_ARGS_2} ./bs_${BOARD}_tests_bluetooth_bsim_ll_edtt_hci_test_app_${PRJ_CONF_2}\ + ${RR_ARGS_2} ./bs_${BOARD}_tests_bsim_bluetooth_ll_edtt_hci_test_app_${PRJ_CONF_2}\ -s=${SIMULATION_ID} -d=1 -v=${VERBOSITY_LEVEL_DEV2} -RealEncryption=1 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL_PHY} -s=${SIMULATION_ID} \ diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/gap.llcp.sh b/tests/bsim/bluetooth/ll/edtt/tests_scripts/gap.llcp.sh similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/gap.llcp.sh rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/gap.llcp.sh diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/gap.llcp.test_list b/tests/bsim/bluetooth/ll/edtt/tests_scripts/gap.llcp.test_list similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/gap.llcp.test_list rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/gap.llcp.test_list diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/gatt.llcp.sh b/tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.sh similarity index 90% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/gatt.llcp.sh rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.sh index 382e56a5241..f30f866923e 100755 --- a/tests/bluetooth/bsim/ll/edtt/tests_scripts/gatt.llcp.sh +++ b/tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.sh @@ -32,11 +32,11 @@ Execute ./src/edttool.py -s=${SIMULATION_ID} -d=0 --transport bsim \ cd ${BSIM_OUT_PATH}/bin Execute \ - ./bs_${BOARD}_tests_bluetooth_bsim_ll_edtt_hci_test_app_prj_tst_llcp_conf\ + ./bs_${BOARD}_tests_bsim_bluetooth_ll_edtt_hci_test_app_prj_tst_llcp_conf\ -s=${SIMULATION_ID} -d=1 -v=${VERBOSITY_LEVEL} -RealEncryption=1 Execute \ - ./bs_${BOARD}_tests_bluetooth_bsim_ll_edtt_gatt_test_app_prj_llcp_conf\ + ./bs_${BOARD}_tests_bsim_bluetooth_ll_edtt_gatt_test_app_prj_llcp_conf\ -s=${SIMULATION_ID} -d=2 -v=${VERBOSITY_LEVEL} -RealEncryption=1 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \ diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/gatt.llcp.test_list b/tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.test_list similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/gatt.llcp.test_list rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.test_list diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/hci.llcp.sh b/tests/bsim/bluetooth/ll/edtt/tests_scripts/hci.llcp.sh similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/hci.llcp.sh rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/hci.llcp.sh diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/hci.llcp.test_list b/tests/bsim/bluetooth/ll/edtt/tests_scripts/hci.llcp.test_list similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/hci.llcp.test_list rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/hci.llcp.test_list diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.1.llcp.sh b/tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.1.llcp.sh similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.1.llcp.sh rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.1.llcp.sh diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.2.llcp.sh b/tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.2.llcp.sh similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.2.llcp.sh rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.2.llcp.sh diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.set1.llcp.test_list b/tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.set1.llcp.test_list similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.set1.llcp.test_list rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.set1.llcp.test_list diff --git a/tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.set2.llcp.test_list b/tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.set2.llcp.test_list similarity index 100% rename from tests/bluetooth/bsim/ll/edtt/tests_scripts/ll.set2.llcp.test_list rename to tests/bsim/bluetooth/ll/edtt/tests_scripts/ll.set2.llcp.test_list diff --git a/tests/bluetooth/bsim/ll/iso/CMakeLists.txt b/tests/bsim/bluetooth/ll/iso/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/ll/iso/CMakeLists.txt rename to tests/bsim/bluetooth/ll/iso/CMakeLists.txt diff --git a/tests/bluetooth/bsim/ll/iso/prj.conf b/tests/bsim/bluetooth/ll/iso/prj.conf similarity index 100% rename from tests/bluetooth/bsim/ll/iso/prj.conf rename to tests/bsim/bluetooth/ll/iso/prj.conf diff --git a/tests/bluetooth/bsim/ll/iso/prj_vs_dp.conf b/tests/bsim/bluetooth/ll/iso/prj_vs_dp.conf similarity index 100% rename from tests/bluetooth/bsim/ll/iso/prj_vs_dp.conf rename to tests/bsim/bluetooth/ll/iso/prj_vs_dp.conf diff --git a/tests/bluetooth/bsim/ll/iso/src/main.c b/tests/bsim/bluetooth/ll/iso/src/main.c similarity index 100% rename from tests/bluetooth/bsim/ll/iso/src/main.c rename to tests/bsim/bluetooth/ll/iso/src/main.c diff --git a/tests/bluetooth/bsim/ll/iso/tests_scripts/broadcast_iso.sh b/tests/bsim/bluetooth/ll/iso/tests_scripts/broadcast_iso.sh similarity index 89% rename from tests/bluetooth/bsim/ll/iso/tests_scripts/broadcast_iso.sh rename to tests/bsim/bluetooth/ll/iso/tests_scripts/broadcast_iso.sh index 4a576327cc1..bbec1b2c712 100755 --- a/tests/bluetooth/bsim/ll/iso/tests_scripts/broadcast_iso.sh +++ b/tests/bsim/bluetooth/ll/iso/tests_scripts/broadcast_iso.sh @@ -24,10 +24,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_iso_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_iso_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=receive -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_iso_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_iso_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=broadcast Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/ll/iso/tests_scripts/broadcast_iso_vs_dp.sh b/tests/bsim/bluetooth/ll/iso/tests_scripts/broadcast_iso_vs_dp.sh similarity index 89% rename from tests/bluetooth/bsim/ll/iso/tests_scripts/broadcast_iso_vs_dp.sh rename to tests/bsim/bluetooth/ll/iso/tests_scripts/broadcast_iso_vs_dp.sh index 6d7a98cf123..62b73731467 100755 --- a/tests/bluetooth/bsim/ll/iso/tests_scripts/broadcast_iso_vs_dp.sh +++ b/tests/bsim/bluetooth/ll/iso/tests_scripts/broadcast_iso_vs_dp.sh @@ -24,10 +24,10 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_iso_prj_vs_dp_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_iso_prj_vs_dp_conf \ -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=receive_vs_dp -Execute ./bs_${BOARD}_tests_bluetooth_bsim_ll_iso_prj_conf \ +Execute ./bs_${BOARD}_tests_bsim_bluetooth_ll_iso_prj_conf \ -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=broadcast Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ diff --git a/tests/bluetooth/bsim/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt similarity index 100% rename from tests/bluetooth/bsim/mesh/CMakeLists.txt rename to tests/bsim/bluetooth/mesh/CMakeLists.txt diff --git a/tests/bluetooth/bsim/mesh/README.rst b/tests/bsim/bluetooth/mesh/README.rst similarity index 98% rename from tests/bluetooth/bsim/mesh/README.rst rename to tests/bsim/bluetooth/mesh/README.rst index f2c44759f2c..787b0084f0b 100644 --- a/tests/bluetooth/bsim/mesh/README.rst +++ b/tests/bsim/bluetooth/mesh/README.rst @@ -50,7 +50,7 @@ Then separately, call ...code-block:: - gdb bs_nrf52_bsim_tests_bluetooth_bsim_mesh_prj_conf \ + gdb bs_nrf52_bsim_tests_bsim_bluetooth_mesh_prj_conf \ -s=mesh_transport_seg_block -d=0 -RealEncryption=1 \ -testid=transport_tx_seg_block diff --git a/tests/bluetooth/bsim/mesh/_mesh_test.sh b/tests/bsim/bluetooth/mesh/_mesh_test.sh similarity index 93% rename from tests/bluetooth/bsim/mesh/_mesh_test.sh rename to tests/bsim/bluetooth/mesh/_mesh_test.sh index bd303163428..0827585f3c9 100755 --- a/tests/bluetooth/bsim/mesh/_mesh_test.sh +++ b/tests/bsim/bluetooth/mesh/_mesh_test.sh @@ -68,9 +68,9 @@ function RunTest(){ conf=${conf:-prj_conf} if [ ${overlay} ]; then - exe_name=./bs_${BOARD}_tests_bluetooth_bsim_mesh_${conf}_${overlay} + exe_name=./bs_${BOARD}_tests_bsim_bluetooth_mesh_${conf}_${overlay} else - exe_name=./bs_${BOARD}_tests_bluetooth_bsim_mesh_${conf} + exe_name=./bs_${BOARD}_tests_bsim_bluetooth_mesh_${conf} fi Execute \ diff --git a/tests/bluetooth/bsim/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh similarity index 64% rename from tests/bluetooth/bsim/mesh/compile.sh rename to tests/bsim/bluetooth/mesh/compile.sh index d1c2df42c02..635d8465454 100755 --- a/tests/bluetooth/bsim/mesh/compile.sh +++ b/tests/bsim/bluetooth/mesh/compile.sh @@ -18,18 +18,18 @@ 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/mesh compile -app=tests/bluetooth/bsim/mesh conf_overlay=overlay_low_lat.conf compile -app=tests/bluetooth/bsim/mesh conf_overlay=overlay_pst.conf compile -app=tests/bluetooth/bsim/mesh conf_overlay=overlay_gatt.conf compile -app=tests/bluetooth/bsim/mesh conf_file=prj_mesh1d1.conf compile -app=tests/bluetooth/bsim/mesh \ +app=tests/bsim/bluetooth/mesh compile +app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile +app=tests/bsim/bluetooth/mesh conf_overlay=overlay_pst.conf compile +app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt.conf compile +app=tests/bsim/bluetooth/mesh conf_file=prj_mesh1d1.conf compile +app=tests/bsim/bluetooth/mesh \ conf_file=prj_mesh1d1.conf conf_overlay=overlay_pst.conf compile -app=tests/bluetooth/bsim/mesh \ +app=tests/bsim/bluetooth/mesh \ conf_file=prj_mesh1d1.conf conf_overlay=overlay_gatt.conf compile -app=tests/bluetooth/bsim/mesh \ +app=tests/bsim/bluetooth/mesh \ conf_file=prj_mesh1d1.conf conf_overlay=overlay_low_lat.conf compile wait_for_background_jobs diff --git a/tests/bluetooth/bsim/mesh/overlay_gatt.conf b/tests/bsim/bluetooth/mesh/overlay_gatt.conf similarity index 100% rename from tests/bluetooth/bsim/mesh/overlay_gatt.conf rename to tests/bsim/bluetooth/mesh/overlay_gatt.conf diff --git a/tests/bluetooth/bsim/mesh/overlay_low_lat.conf b/tests/bsim/bluetooth/mesh/overlay_low_lat.conf similarity index 100% rename from tests/bluetooth/bsim/mesh/overlay_low_lat.conf rename to tests/bsim/bluetooth/mesh/overlay_low_lat.conf diff --git a/tests/bluetooth/bsim/mesh/overlay_pst.conf b/tests/bsim/bluetooth/mesh/overlay_pst.conf similarity index 100% rename from tests/bluetooth/bsim/mesh/overlay_pst.conf rename to tests/bsim/bluetooth/mesh/overlay_pst.conf diff --git a/tests/bluetooth/bsim/mesh/prj.conf b/tests/bsim/bluetooth/mesh/prj.conf similarity index 100% rename from tests/bluetooth/bsim/mesh/prj.conf rename to tests/bsim/bluetooth/mesh/prj.conf diff --git a/tests/bluetooth/bsim/mesh/prj_mesh1d1.conf b/tests/bsim/bluetooth/mesh/prj_mesh1d1.conf similarity index 100% rename from tests/bluetooth/bsim/mesh/prj_mesh1d1.conf rename to tests/bsim/bluetooth/mesh/prj_mesh1d1.conf diff --git a/tests/bluetooth/bsim/mesh/src/dfu_blob_common.c b/tests/bsim/bluetooth/mesh/src/dfu_blob_common.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/dfu_blob_common.c rename to tests/bsim/bluetooth/mesh/src/dfu_blob_common.c diff --git a/tests/bluetooth/bsim/mesh/src/dfu_blob_common.h b/tests/bsim/bluetooth/mesh/src/dfu_blob_common.h similarity index 100% rename from tests/bluetooth/bsim/mesh/src/dfu_blob_common.h rename to tests/bsim/bluetooth/mesh/src/dfu_blob_common.h diff --git a/tests/bluetooth/bsim/mesh/src/main.c b/tests/bsim/bluetooth/mesh/src/main.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/main.c rename to tests/bsim/bluetooth/mesh/src/main.c diff --git a/tests/bluetooth/bsim/mesh/src/mesh_test.c b/tests/bsim/bluetooth/mesh/src/mesh_test.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/mesh_test.c rename to tests/bsim/bluetooth/mesh/src/mesh_test.c diff --git a/tests/bluetooth/bsim/mesh/src/mesh_test.h b/tests/bsim/bluetooth/mesh/src/mesh_test.h similarity index 100% rename from tests/bluetooth/bsim/mesh/src/mesh_test.h rename to tests/bsim/bluetooth/mesh/src/mesh_test.h diff --git a/tests/bluetooth/bsim/mesh/src/settings_test_backend.c b/tests/bsim/bluetooth/mesh/src/settings_test_backend.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/settings_test_backend.c rename to tests/bsim/bluetooth/mesh/src/settings_test_backend.c diff --git a/tests/bluetooth/bsim/mesh/src/settings_test_backend.h b/tests/bsim/bluetooth/mesh/src/settings_test_backend.h similarity index 100% rename from tests/bluetooth/bsim/mesh/src/settings_test_backend.h rename to tests/bsim/bluetooth/mesh/src/settings_test_backend.h diff --git a/tests/bluetooth/bsim/mesh/src/test_access.c b/tests/bsim/bluetooth/mesh/src/test_access.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_access.c rename to tests/bsim/bluetooth/mesh/src/test_access.c diff --git a/tests/bluetooth/bsim/mesh/src/test_advertiser.c b/tests/bsim/bluetooth/mesh/src/test_advertiser.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_advertiser.c rename to tests/bsim/bluetooth/mesh/src/test_advertiser.c diff --git a/tests/bluetooth/bsim/mesh/src/test_beacon.c b/tests/bsim/bluetooth/mesh/src/test_beacon.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_beacon.c rename to tests/bsim/bluetooth/mesh/src/test_beacon.c diff --git a/tests/bluetooth/bsim/mesh/src/test_blob.c b/tests/bsim/bluetooth/mesh/src/test_blob.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_blob.c rename to tests/bsim/bluetooth/mesh/src/test_blob.c diff --git a/tests/bluetooth/bsim/mesh/src/test_dfu.c b/tests/bsim/bluetooth/mesh/src/test_dfu.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_dfu.c rename to tests/bsim/bluetooth/mesh/src/test_dfu.c diff --git a/tests/bluetooth/bsim/mesh/src/test_friendship.c b/tests/bsim/bluetooth/mesh/src/test_friendship.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_friendship.c rename to tests/bsim/bluetooth/mesh/src/test_friendship.c diff --git a/tests/bluetooth/bsim/mesh/src/test_heartbeat.c b/tests/bsim/bluetooth/mesh/src/test_heartbeat.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_heartbeat.c rename to tests/bsim/bluetooth/mesh/src/test_heartbeat.c diff --git a/tests/bluetooth/bsim/mesh/src/test_iv_index.c b/tests/bsim/bluetooth/mesh/src/test_iv_index.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_iv_index.c rename to tests/bsim/bluetooth/mesh/src/test_iv_index.c diff --git a/tests/bluetooth/bsim/mesh/src/test_lcd.c b/tests/bsim/bluetooth/mesh/src/test_lcd.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_lcd.c rename to tests/bsim/bluetooth/mesh/src/test_lcd.c diff --git a/tests/bluetooth/bsim/mesh/src/test_op_agg.c b/tests/bsim/bluetooth/mesh/src/test_op_agg.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_op_agg.c rename to tests/bsim/bluetooth/mesh/src/test_op_agg.c diff --git a/tests/bluetooth/bsim/mesh/src/test_persistence.c b/tests/bsim/bluetooth/mesh/src/test_persistence.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_persistence.c rename to tests/bsim/bluetooth/mesh/src/test_persistence.c diff --git a/tests/bluetooth/bsim/mesh/src/test_provision.c b/tests/bsim/bluetooth/mesh/src/test_provision.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_provision.c rename to tests/bsim/bluetooth/mesh/src/test_provision.c diff --git a/tests/bluetooth/bsim/mesh/src/test_replay_cache.c b/tests/bsim/bluetooth/mesh/src/test_replay_cache.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_replay_cache.c rename to tests/bsim/bluetooth/mesh/src/test_replay_cache.c diff --git a/tests/bluetooth/bsim/mesh/src/test_sar.c b/tests/bsim/bluetooth/mesh/src/test_sar.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_sar.c rename to tests/bsim/bluetooth/mesh/src/test_sar.c diff --git a/tests/bluetooth/bsim/mesh/src/test_scanner.c b/tests/bsim/bluetooth/mesh/src/test_scanner.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_scanner.c rename to tests/bsim/bluetooth/mesh/src/test_scanner.c diff --git a/tests/bluetooth/bsim/mesh/src/test_transport.c b/tests/bsim/bluetooth/mesh/src/test_transport.c similarity index 100% rename from tests/bluetooth/bsim/mesh/src/test_transport.c rename to tests/bsim/bluetooth/mesh/src/test_transport.c diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/access/access_cancel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/access/access_cancel.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/access/access_ext_sub.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/access/access_ext_sub.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/access/access_ext_sub_cap.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/access/access_ext_sub_cap.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/access/access_period.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/access/access_period.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/access/access_transmit.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/access/access_transmit.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/advertiser/proxy_mixin.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/advertiser/proxy_mixin.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/advertiser/random_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/advertiser/random_order.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/advertiser/reverse_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/advertiser/reverse_order.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/advertiser/send_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/advertiser/send_order.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/advertiser/tx_cb_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/advertiser/tx_cb_multi.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/advertiser/tx_cb_single.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/advertiser/tx_cb_single.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/beacon/beacon_interval.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/beacon/beacon_interval.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/beacon/invalid.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/beacon/invalid.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/beacon/iv_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/beacon/iv_update.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/beacon/key_refresh.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/beacon/key_refresh.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/beacon/kr_old_key.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/beacon/kr_old_key.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/beacon/multiple_netkeys.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/beacon/multiple_netkeys.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_dist_self_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_dist_self_update.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_mixed.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_mixed.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_mixed_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_mixed_fail.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_slot.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/dfu/dfu_slot.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/establish.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/establish.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/establish_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/establish_multi.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/lpn_disable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/lpn_disable.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/lpn_loopback.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/lpn_loopback.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/lpn_terminate_cb.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/lpn_terminate_cb.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_frnd.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_frnd.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_group.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_mesh.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_mesh.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/overflow.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/overflow.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/poll.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/poll.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/friendship/re-establish.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/friendship/re-establish.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/iv_index/iv_deferring.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/iv_index/iv_deferring.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/iv_index/iv_recovery.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/iv_index/iv_recovery.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/iv_index/iv_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/iv_index/iv_update.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_metadata_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/large_comp_data/get_metadata_split.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/op_agg/full_status_msg_list.sh b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/op_agg/full_status_msg_list.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/persistence/access.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/persistence/access.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/persistence/cfg.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/persistence/cfg.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/persistence/provisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/persistence/provisioning.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/persistence/reprovisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/persistence/reprovisioning.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/ivu_flag_one_duration.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/ivu_flag_one_duration.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_multi.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_no_oob.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_no_oob.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_adv_reprovision.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_remote_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/provision/pb_remote_reprovision.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/replay_cache/replay_attack.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/replay_cache/replay_attack.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/replay_cache/rpl_frag.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/replay_cache/rpl_frag.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/sar/slow_transfer_test.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/sar/slow_transfer_test.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/sar/stress_test.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/sar/stress_test.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/scanner/invalid_ad_type.sh b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/scanner/invalid_ad_type.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/scanner/wrong_packet_length.sh b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/scanner/wrong_packet_length.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/group.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/loopback.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/loopback.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/loopback_group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/loopback_group.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/loopback_group_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/loopback_group_low_lat.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_block.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_block.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_concurrent.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_concurrent.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_fail.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_ivu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/seg_ivu.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/unicast.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/unicast_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/unicast_low_lat.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/unknown_app.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/unknown_app.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh diff --git a/tests/bluetooth/bsim/mesh/tests_scripts/transport/va.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh similarity index 100% rename from tests/bluetooth/bsim/mesh/tests_scripts/transport/va.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh diff --git a/tests/bluetooth/bsim/run_parallel.sh b/tests/bsim/bluetooth/run_parallel.sh similarity index 100% rename from tests/bluetooth/bsim/run_parallel.sh rename to tests/bsim/bluetooth/run_parallel.sh diff --git a/tests/bluetooth/bsim/sh_common.source b/tests/bsim/bluetooth/sh_common.source similarity index 100% rename from tests/bluetooth/bsim/sh_common.source rename to tests/bsim/bluetooth/sh_common.source