From 8b4907ee97225e5726c36cbc37cadd6108430116 Mon Sep 17 00:00:00 2001 From: Aleksander Wasaznik Date: Mon, 12 Aug 2024 12:53:40 +0200 Subject: [PATCH] Bluetooth: bsim: deduplicate compile scripts Some tests have a compile script for that test alone, named `_compile.sh` or `_build.sh`. These scripts are useful for developers to avoid compiling the world. But these scripts were not run in the CI. These scripts were previously not suitable for running in the CI because would put the artefact in the source directory, but this is no longer the case, and the CI could run these scripts now. This commit renames any `/test_scripts/_compile.sh` and `/test_scripts/_build.sh` to `/compile.sh`. The test runner in CI will ignores any file named `compile.sh`, so there is no need for a underscore prefix. This fits into and extends the hierarchical structure of `compile.sh` chain that starts at `:/test/bsim/compile.sh`, the CI build script tree. The newly moved scripts now become a part of the build script tree, called from a `compile.sh` where a duplicate set of build commands was before. The sub scripts use `run_in_background` to preserve the parallelism as it was before this change. This removes an error-prone duplication and makes the CI test all the build scripts. Tests that did not have any compile script are not given one for now. Signed-off-by: Aleksander Wasaznik --- tests/bsim/bluetooth/host/adv/compile.sh | 4 ++-- .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 tests/bsim/bluetooth/host/att/compile.sh | 20 ++++++----------- .../{test_scripts/_build.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_build.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 tests/bsim/bluetooth/host/compile.sh | 22 ++++++++----------- .../{test_scripts/_compile.sh => compile.sh} | 0 tests/bsim/bluetooth/host/gatt/compile.sh | 8 +++---- .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 tests/bsim/bluetooth/host/l2cap/compile.sh | 11 ++++------ .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 tests/bsim/bluetooth/host/security/compile.sh | 16 +++++++------- .../{test_scripts/_compile.sh => compile.sh} | 0 .../{test_scripts/_compile.sh => compile.sh} | 0 37 files changed, 33 insertions(+), 48 deletions(-) rename tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/adv/long_ad/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/att/long_read/{test_scripts/_build.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/att/mtu_update/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/att/open_close/{test_scripts/_build.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/att/pipeline/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/att/read_fill_buf/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/att/retry_on_sec_err/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/att/sequential/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/gatt/ccc_store/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/gatt/sc_indicate/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/gatt/settings/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/id/settings/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/l2cap/ecred/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/l2cap/multilink_peripheral/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/l2cap/reassembly/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/l2cap/split/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/misc/disconnect/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/misc/hfc/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/misc/hfc_multilink/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/misc/sample_test/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/privacy/central/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/privacy/device/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/privacy/legacy/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/privacy/peripheral/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/security/bond_overwrite_allowed/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/security/bond_overwrite_denied/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/security/bond_per_connection/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/security/ccc_update/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/security/id_addr_update/{test_scripts/_compile.sh => compile.sh} (100%) rename tests/bsim/bluetooth/host/security/security_changed_callback/{test_scripts/_compile.sh => compile.sh} (100%) diff --git a/tests/bsim/bluetooth/host/adv/compile.sh b/tests/bsim/bluetooth/host/adv/compile.sh index fda294cf535..845f86db003 100755 --- a/tests/bsim/bluetooth/host/adv/compile.sh +++ b/tests/bsim/bluetooth/host/adv/compile.sh @@ -16,8 +16,8 @@ app=tests/bsim/bluetooth/host/adv/extended conf_file=prj_scanner.conf 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/adv/periodic conf_file=prj_coded.conf compile -app=tests/bsim/bluetooth/host/adv/encrypted/css_sample_data compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/compile.sh app=tests/bsim/bluetooth/host/adv/encrypted/ead_sample compile -app=tests/bsim/bluetooth/host/adv/long_ad compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/adv/long_ad/compile.sh wait_for_background_jobs diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/compile.sh diff --git a/tests/bsim/bluetooth/host/adv/long_ad/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/adv/long_ad/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/adv/long_ad/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/adv/long_ad/compile.sh diff --git a/tests/bsim/bluetooth/host/att/compile.sh b/tests/bsim/bluetooth/host/att/compile.sh index 59d232be3a4..46fddfa1419 100755 --- a/tests/bsim/bluetooth/host/att/compile.sh +++ b/tests/bsim/bluetooth/host/att/compile.sh @@ -15,18 +15,12 @@ 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/att/read_fill_buf/client compile -app=tests/bsim/bluetooth/host/att/read_fill_buf/server compile -app=tests/bsim/bluetooth/host/att/retry_on_sec_err/client compile -app=tests/bsim/bluetooth/host/att/retry_on_sec_err/server compile -app=tests/bsim/bluetooth/host/att/sequential/dut compile -app=tests/bsim/bluetooth/host/att/sequential/tester compile -app=tests/bsim/bluetooth/host/att/pipeline/dut compile -app=tests/bsim/bluetooth/host/att/pipeline/dut \ - conf_file='prj.conf;rx_tx_prio_invert.extra.conf' compile -app=tests/bsim/bluetooth/host/att/pipeline/tester compile -app=tests/bsim/bluetooth/host/att/long_read compile -app=tests/bsim/bluetooth/host/att/open_close compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/mtu_update/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/read_fill_buf/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/retry_on_sec_err/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/sequential/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/pipeline/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/long_read/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/open_close/compile.sh wait_for_background_jobs diff --git a/tests/bsim/bluetooth/host/att/long_read/test_scripts/_build.sh b/tests/bsim/bluetooth/host/att/long_read/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/att/long_read/test_scripts/_build.sh rename to tests/bsim/bluetooth/host/att/long_read/compile.sh diff --git a/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/mtu_update/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/att/mtu_update/compile.sh diff --git a/tests/bsim/bluetooth/host/att/open_close/test_scripts/_build.sh b/tests/bsim/bluetooth/host/att/open_close/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/att/open_close/test_scripts/_build.sh rename to tests/bsim/bluetooth/host/att/open_close/compile.sh diff --git a/tests/bsim/bluetooth/host/att/pipeline/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/pipeline/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/att/pipeline/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/att/pipeline/compile.sh diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/read_fill_buf/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/att/read_fill_buf/compile.sh diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/retry_on_sec_err/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/att/retry_on_sec_err/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/att/retry_on_sec_err/compile.sh diff --git a/tests/bsim/bluetooth/host/att/sequential/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/sequential/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/att/sequential/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/att/sequential/compile.sh diff --git a/tests/bsim/bluetooth/host/compile.sh b/tests/bsim/bluetooth/host/compile.sh index c7c2975ee73..6c6348aa030 100755 --- a/tests/bsim/bluetooth/host/compile.sh +++ b/tests/bsim/bluetooth/host/compile.sh @@ -23,23 +23,19 @@ app=tests/bsim/bluetooth/host/iso/bis compile app=tests/bsim/bluetooth/host/iso/frag compile app=tests/bsim/bluetooth/host/misc/disable compile -app=tests/bsim/bluetooth/host/misc/disconnect/dut compile -app=tests/bsim/bluetooth/host/misc/disconnect/tester compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/misc/disconnect/compile.sh app=tests/bsim/bluetooth/host/misc/conn_stress/central compile app=tests/bsim/bluetooth/host/misc/conn_stress/peripheral compile -app=tests/bsim/bluetooth/host/misc/hfc compile -app=tests/bsim/bluetooth/host/misc/hfc_multilink/dut compile -app=tests/bsim/bluetooth/host/misc/hfc_multilink/tester compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/misc/hfc/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/misc/hfc_multilink/compile.sh app=tests/bsim/bluetooth/host/misc/unregister_conn_cb compile -app=tests/bsim/bluetooth/host/misc/sample_test compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/misc/sample_test/compile.sh -app=tests/bsim/bluetooth/host/privacy/central compile -app=tests/bsim/bluetooth/host/privacy/peripheral compile -app=tests/bsim/bluetooth/host/privacy/peripheral conf_file=prj_rpa_expired.conf compile -app=tests/bsim/bluetooth/host/privacy/peripheral conf_file=prj_rpa_sharing.conf compile -app=tests/bsim/bluetooth/host/privacy/device compile -app=tests/bsim/bluetooth/host/privacy/legacy compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/privacy/central/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/privacy/peripheral/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/privacy/device/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/privacy/legacy/compile.sh -app=tests/bsim/bluetooth/host/id/settings compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/id/settings/compile.sh wait_for_background_jobs diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/gatt/ccc_store/compile.sh diff --git a/tests/bsim/bluetooth/host/gatt/compile.sh b/tests/bsim/bluetooth/host/gatt/compile.sh index 67ebb09be9e..d26e4007e69 100755 --- a/tests/bsim/bluetooth/host/gatt/compile.sh +++ b/tests/bsim/bluetooth/host/gatt/compile.sh @@ -16,10 +16,8 @@ app=tests/bsim/bluetooth/host/gatt/caching conf_overlay=psa_overlay.conf 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/ccc_store compile -app=tests/bsim/bluetooth/host/gatt/ccc_store conf_file=prj_2.conf compile -app=tests/bsim/bluetooth/host/gatt/sc_indicate compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/gatt/settings/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/gatt/ccc_store/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/gatt/sc_indicate/compile.sh wait_for_background_jobs diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/gatt/sc_indicate/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/gatt/sc_indicate/compile.sh diff --git a/tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/gatt/settings/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/gatt/settings/compile.sh diff --git a/tests/bsim/bluetooth/host/id/settings/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/id/settings/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/id/settings/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/id/settings/compile.sh diff --git a/tests/bsim/bluetooth/host/l2cap/compile.sh b/tests/bsim/bluetooth/host/l2cap/compile.sh index 9485c539a2a..1c9aeda824c 100755 --- a/tests/bsim/bluetooth/host/l2cap/compile.sh +++ b/tests/bsim/bluetooth/host/l2cap/compile.sh @@ -11,19 +11,16 @@ set -ue source ${ZEPHYR_BASE}/tests/bsim/compile.source app=tests/bsim/bluetooth/host/l2cap/many_conns compile -app=tests/bsim/bluetooth/host/l2cap/multilink_peripheral compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/compile.sh app=tests/bsim/bluetooth/host/l2cap/general compile app=tests/bsim/bluetooth/host/l2cap/userdata compile app=tests/bsim/bluetooth/host/l2cap/userdata conf_file=prj_no_checks.conf compile app=tests/bsim/bluetooth/host/l2cap/stress compile app=tests/bsim/bluetooth/host/l2cap/stress conf_file=prj_nofrag.conf compile app=tests/bsim/bluetooth/host/l2cap/stress conf_file=prj_syswq.conf compile -app=tests/bsim/bluetooth/host/l2cap/split/dut compile -app=tests/bsim/bluetooth/host/l2cap/split/tester compile -app=tests/bsim/bluetooth/host/l2cap/reassembly/dut compile -app=tests/bsim/bluetooth/host/l2cap/reassembly/peer compile -app=tests/bsim/bluetooth/host/l2cap/ecred/dut compile -app=tests/bsim/bluetooth/host/l2cap/ecred/peer compile +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/split/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/reassembly/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/ecred/compile.sh app=tests/bsim/bluetooth/host/l2cap/credits compile app=tests/bsim/bluetooth/host/l2cap/credits conf_file=prj_ecred.conf compile app=tests/bsim/bluetooth/host/l2cap/credits_seg_recv compile diff --git a/tests/bsim/bluetooth/host/l2cap/ecred/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/ecred/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/l2cap/ecred/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/l2cap/ecred/compile.sh diff --git a/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/l2cap/multilink_peripheral/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/l2cap/multilink_peripheral/compile.sh diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/reassembly/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/l2cap/reassembly/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/l2cap/reassembly/compile.sh diff --git a/tests/bsim/bluetooth/host/l2cap/split/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/split/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/l2cap/split/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/l2cap/split/compile.sh diff --git a/tests/bsim/bluetooth/host/misc/disconnect/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/misc/disconnect/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/misc/disconnect/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/misc/disconnect/compile.sh diff --git a/tests/bsim/bluetooth/host/misc/hfc/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/misc/hfc/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/misc/hfc/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/misc/hfc/compile.sh diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/misc/hfc_multilink/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/misc/hfc_multilink/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/misc/hfc_multilink/compile.sh diff --git a/tests/bsim/bluetooth/host/misc/sample_test/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/misc/sample_test/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/misc/sample_test/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/misc/sample_test/compile.sh diff --git a/tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/central/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/privacy/central/compile.sh diff --git a/tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/device/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/privacy/device/compile.sh diff --git a/tests/bsim/bluetooth/host/privacy/legacy/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/legacy/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/privacy/legacy/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/privacy/legacy/compile.sh diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/peripheral/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/privacy/peripheral/compile.sh diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_allowed/compile.sh diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/bond_overwrite_denied/compile.sh diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_per_connection/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/security/bond_per_connection/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/bond_per_connection/compile.sh diff --git a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/ccc_update/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/security/ccc_update/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/ccc_update/compile.sh diff --git a/tests/bsim/bluetooth/host/security/compile.sh b/tests/bsim/bluetooth/host/security/compile.sh index 9296cd8e4c1..e837aec5266 100755 --- a/tests/bsim/bluetooth/host/security/compile.sh +++ b/tests/bsim/bluetooth/host/security/compile.sh @@ -10,13 +10,13 @@ set -ue source ${ZEPHYR_BASE}/tests/bsim/compile.source -app=tests/bsim/bluetooth/host/security/bond_overwrite_allowed compile -app=tests/bsim/bluetooth/host/security/bond_overwrite_denied compile -app=tests/bsim/bluetooth/host/security/bond_per_connection compile -app=tests/bsim/bluetooth/host/security/ccc_update compile -app=tests/bsim/bluetooth/host/security/ccc_update conf_file=prj_2.conf compile -app=tests/bsim/bluetooth/host/security/id_addr_update/central compile -app=tests/bsim/bluetooth/host/security/id_addr_update/peripheral compile -app=tests/bsim/bluetooth/host/security/security_changed_callback compile +run_in_background \ + ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/security/bond_overwrite_denied/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/security/bond_per_connection/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/security/ccc_update/compile.sh +run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/security/id_addr_update/compile.sh +run_in_background \ + ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/security/security_changed_callback/compile.sh wait_for_background_jobs diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/id_addr_update/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/security/id_addr_update/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/id_addr_update/compile.sh diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/security_changed_callback/compile.sh similarity index 100% rename from tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/_compile.sh rename to tests/bsim/bluetooth/host/security/security_changed_callback/compile.sh