From a5f255d6040a5672f2f766b383074645ec2e848b Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Thu, 21 Mar 2024 15:12:13 +0100 Subject: [PATCH] tests/bsim sh scripts: Reduce boilerplate Remove the boilerplate which is not necessary beacuse it is already provided by the common scripts Signed-off-by: Alberto Escolar Piedras --- tests/bsim/bluetooth/audio/compile.sh | 13 +------------ tests/bsim/bluetooth/audio_samples/compile.sh | 10 +--------- .../bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh | 9 +-------- .../bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh | 9 +-------- tests/bsim/bluetooth/compile.sh | 10 +--------- tests/bsim/bluetooth/hci_uart/compile.sh | 10 +--------- tests/bsim/bluetooth/host/adv/compile.sh | 11 +---------- .../css_sample_data/test_scripts/_compile.sh | 1 - .../host/adv/resume/test_scripts/_compile.sh | 2 -- tests/bsim/bluetooth/host/att/compile.sh | 11 +---------- .../host/att/long_read/test_scripts/_build.sh | 2 -- .../host/att/mtu_update/test_scripts/_compile.sh | 1 - .../host/att/open_close/test_scripts/_build.sh | 1 - .../host/att/pipeline/test_scripts/_compile.sh | 2 -- .../host/att/read_fill_buf/test_scripts/_compile.sh | 2 -- .../att/retry_on_sec_err/test_scripts/_compile.sh | 2 -- .../host/att/sequential/test_scripts/_compile.sh | 2 -- tests/bsim/bluetooth/host/compile.sh | 10 +--------- .../host/gatt/ccc_store/test_scripts/_compile.sh | 2 -- tests/bsim/bluetooth/host/gatt/compile.sh | 11 +---------- .../host/gatt/sc_indicate/test_scripts/_compile.sh | 3 --- .../host/gatt/settings/test_scripts/_compile.sh | 2 -- .../host/id/settings/test_scripts/_compile.sh | 2 -- .../host/iso/cis/tests_scripts/_compile.sh | 2 -- tests/bsim/bluetooth/host/l2cap/compile.sh | 11 +---------- .../host/l2cap/credits/tests_scripts/_compile.sh | 2 -- .../credits_seg_recv/tests_scripts/_compile.sh | 2 -- .../host/l2cap/frags/tests_scripts/_compile.sh | 2 -- .../host/l2cap/split/test_scripts/_compile.sh | 2 -- .../host/l2cap/stress/tests_scripts/_compile.sh | 2 -- .../host/misc/disconnect/test_scripts/_compile.sh | 3 +-- .../host/misc/hfc/test_scripts/_compile.sh | 3 +-- .../unregister_conn_cb/tests_scripts/_compile.sh | 3 +-- .../host/privacy/central/test_scripts/_compile.sh | 3 +-- .../host/privacy/device/test_scripts/_compile.sh | 4 +--- .../host/privacy/legacy/test_scripts/_compile.sh | 4 +--- .../privacy/peripheral/test_scripts/_compile.sh | 3 --- .../bond_overwrite_allowed/test_scripts/_compile.sh | 3 --- .../bond_overwrite_denied/test_scripts/_compile.sh | 3 +-- .../bond_per_connection/test_scripts/_compile.sh | 3 +-- .../security/ccc_update/test_scripts/_compile.sh | 2 -- tests/bsim/bluetooth/host/security/compile.sh | 11 +---------- .../id_addr_update/test_scripts/_compile.sh | 2 -- .../test_scripts/_compile.sh | 3 +-- tests/bsim/bluetooth/ll/cis/compile.sh | 10 +--------- tests/bsim/bluetooth/ll/compile.sh | 10 +--------- tests/bsim/bluetooth/mesh/compile.sh | 9 +-------- tests/bsim/compile.sh | 11 +---------- tests/bsim/drivers/uart/compile.sh | 11 +---------- tests/bsim/net/compile.sh | 11 +---------- 50 files changed, 27 insertions(+), 236 deletions(-) diff --git a/tests/bsim/bluetooth/audio/compile.sh b/tests/bsim/bluetooth/audio/compile.sh index ae714ec1145..f7bfa8f71b7 100755 --- a/tests/bsim/bluetooth/audio/compile.sh +++ b/tests/bsim/bluetooth/audio/compile.sh @@ -6,18 +6,7 @@ #set -x #uncomment this line for debugging set -ue - - - -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/audio_samples/compile.sh b/tests/bsim/bluetooth/audio_samples/compile.sh index fa6f232c497..e12dd326516 100755 --- a/tests/bsim/bluetooth/audio_samples/compile.sh +++ b/tests/bsim/bluetooth/audio_samples/compile.sh @@ -7,15 +7,7 @@ #set -x #uncomment this line for debugging set -ue -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh b/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh index 6e1dea448d6..ea9afa930e5 100755 --- a/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh +++ b/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh @@ -6,17 +6,10 @@ #set -x #uncomment this line for debugging set -ue -: "${BSIM_COMPONENTS_PATH:?BSIM_COMPONENTS_PATH must be defined}" -: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root\ - directory}" +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" - -BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" export BOARD="${BOARD:-nrf5340bsim/nrf5340/cpuapp}" -mkdir -p ${WORK_DIR} - source ${ZEPHYR_BASE}/tests/bsim/compile.source app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_privacy.conf sysbuild=1 compile diff --git a/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh b/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh index a0092fe5ea0..dcb20010a1b 100755 --- a/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh +++ b/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh @@ -6,17 +6,10 @@ #set -x #uncomment this line for debugging set -ue -: "${BSIM_COMPONENTS_PATH:?BSIM_COMPONENTS_PATH must be defined}" -: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root\ - directory}" +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" - -BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" export BOARD="${BOARD:-nrf5340bsim/nrf5340/cpunet}" -mkdir -p ${WORK_DIR} - source ${ZEPHYR_BASE}/tests/bsim/sh_common.source ${ZEPHYR_BASE}/tests/bsim/bluetooth/ll/compile.sh diff --git a/tests/bsim/bluetooth/compile.sh b/tests/bsim/bluetooth/compile.sh index c0e3d813d72..84a4f8c981a 100755 --- a/tests/bsim/bluetooth/compile.sh +++ b/tests/bsim/bluetooth/compile.sh @@ -6,15 +6,7 @@ #set -x #uncomment this line for debugging set -ue -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/hci_uart/compile.sh b/tests/bsim/bluetooth/hci_uart/compile.sh index 60eb464867a..e617ca0d309 100755 --- a/tests/bsim/bluetooth/hci_uart/compile.sh +++ b/tests/bsim/bluetooth/hci_uart/compile.sh @@ -6,15 +6,7 @@ #set -x #uncomment this line for debugging set -ue -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/adv/compile.sh b/tests/bsim/bluetooth/host/adv/compile.sh index 026b436f0cd..17acdbd3d0a 100755 --- a/tests/bsim/bluetooth/host/adv/compile.sh +++ b/tests/bsim/bluetooth/host/adv/compile.sh @@ -6,16 +6,7 @@ #set -x #uncomment this line for debugging set -ue - -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source 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/test_scripts/_compile.sh index af200055c53..de926e8b267 100755 --- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/_compile.sh @@ -6,7 +6,6 @@ set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/adv/resume/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/adv/resume/test_scripts/_compile.sh index 7fad3e25a89..baa42cdb7a6 100755 --- a/tests/bsim/bluetooth/host/adv/resume/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/adv/resume/test_scripts/_compile.sh @@ -3,10 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/att/compile.sh b/tests/bsim/bluetooth/host/att/compile.sh index 8361a9e8644..b3da250ba1b 100755 --- a/tests/bsim/bluetooth/host/att/compile.sh +++ b/tests/bsim/bluetooth/host/att/compile.sh @@ -6,16 +6,7 @@ #set -x #uncomment this line for debugging set -ue - -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/att/long_read/test_scripts/_build.sh b/tests/bsim/bluetooth/host/att/long_read/test_scripts/_build.sh index af200055c53..718910a63c4 100755 --- a/tests/bsim/bluetooth/host/att/long_read/test_scripts/_build.sh +++ b/tests/bsim/bluetooth/host/att/long_read/test_scripts/_build.sh @@ -3,10 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh index ca1f96b562c..42740d4bfc9 100755 --- a/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh @@ -5,7 +5,6 @@ set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/att/open_close/test_scripts/_build.sh b/tests/bsim/bluetooth/host/att/open_close/test_scripts/_build.sh index af200055c53..de926e8b267 100755 --- a/tests/bsim/bluetooth/host/att/open_close/test_scripts/_build.sh +++ b/tests/bsim/bluetooth/host/att/open_close/test_scripts/_build.sh @@ -6,7 +6,6 @@ set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/att/pipeline/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/pipeline/test_scripts/_compile.sh index 3579ab2e772..ff0f485b17d 100755 --- a/tests/bsim/bluetooth/host/att/pipeline/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/att/pipeline/test_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/_compile.sh index 1fa38a6d27f..6c80f22923a 100755 --- a/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/_compile.sh @@ -1,11 +1,9 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source 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/test_scripts/_compile.sh index 1fa38a6d27f..6c80f22923a 100755 --- a/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_scripts/_compile.sh @@ -1,11 +1,9 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/att/sequential/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/att/sequential/test_scripts/_compile.sh index 3579ab2e772..ff0f485b17d 100755 --- a/tests/bsim/bluetooth/host/att/sequential/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/att/sequential/test_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/compile.sh b/tests/bsim/bluetooth/host/compile.sh index f2a61050216..de3fd1cd940 100755 --- a/tests/bsim/bluetooth/host/compile.sh +++ b/tests/bsim/bluetooth/host/compile.sh @@ -7,15 +7,7 @@ #set -x #uncomment this line for debugging set -ue -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/_compile.sh index ac5eb694236..cb72bfca81c 100755 --- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/gatt/compile.sh b/tests/bsim/bluetooth/host/gatt/compile.sh index 21ca39f3d99..3fc026e67cc 100755 --- a/tests/bsim/bluetooth/host/gatt/compile.sh +++ b/tests/bsim/bluetooth/host/gatt/compile.sh @@ -6,16 +6,7 @@ #set -x #uncomment this line for debugging set -ue - -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/_compile.sh index b45cd9fb77d..80030a894f2 100755 --- a/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/_compile.sh @@ -2,14 +2,11 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source app="$(guess_test_relpath)" compile - wait_for_background_jobs diff --git a/tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh index ac5eb694236..cb72bfca81c 100755 --- a/tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/id/settings/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/id/settings/test_scripts/_compile.sh index af200055c53..718910a63c4 100755 --- a/tests/bsim/bluetooth/host/id/settings/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/id/settings/test_scripts/_compile.sh @@ -3,10 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/iso/cis/tests_scripts/_compile.sh b/tests/bsim/bluetooth/host/iso/cis/tests_scripts/_compile.sh index 4fa833c38ac..e717a4b2bbe 100755 --- a/tests/bsim/bluetooth/host/iso/cis/tests_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/iso/cis/tests_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/l2cap/compile.sh b/tests/bsim/bluetooth/host/l2cap/compile.sh index c86527f00e1..b08686e12ab 100755 --- a/tests/bsim/bluetooth/host/l2cap/compile.sh +++ b/tests/bsim/bluetooth/host/l2cap/compile.sh @@ -6,16 +6,7 @@ #set -x #uncomment this line for debugging set -ue - -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/_compile.sh index 98c4d1bb18a..12c5b388261 100755 --- a/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/_compile.sh index 98c4d1bb18a..12c5b388261 100755 --- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/l2cap/frags/tests_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/frags/tests_scripts/_compile.sh index 17b454f9d7c..80030a894f2 100755 --- a/tests/bsim/bluetooth/host/l2cap/frags/tests_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/l2cap/frags/tests_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/l2cap/split/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/split/test_scripts/_compile.sh index 3579ab2e772..ff0f485b17d 100755 --- a/tests/bsim/bluetooth/host/l2cap/split/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/l2cap/split/test_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/_compile.sh b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/_compile.sh index 56cf572829e..a30326f1afc 100755 --- a/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/_compile.sh @@ -2,10 +2,8 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/misc/disconnect/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/misc/disconnect/test_scripts/_compile.sh index fbdcdbacac2..ff0f485b17d 100755 --- a/tests/bsim/bluetooth/host/misc/disconnect/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/misc/disconnect/test_scripts/_compile.sh @@ -2,12 +2,11 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source + app="$(guess_test_relpath)"/dut compile app="$(guess_test_relpath)"/tester compile diff --git a/tests/bsim/bluetooth/host/misc/hfc/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/misc/hfc/test_scripts/_compile.sh index 17b454f9d7c..e717a4b2bbe 100755 --- a/tests/bsim/bluetooth/host/misc/hfc/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/misc/hfc/test_scripts/_compile.sh @@ -2,11 +2,10 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 + source ${ZEPHYR_BASE}/tests/bsim/compile.source app="$(guess_test_relpath)" compile diff --git a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/tests_scripts/_compile.sh b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/tests_scripts/_compile.sh index 17b454f9d7c..e717a4b2bbe 100755 --- a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/tests_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/tests_scripts/_compile.sh @@ -2,11 +2,10 @@ # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 + source ${ZEPHYR_BASE}/tests/bsim/compile.source app="$(guess_test_relpath)" compile diff --git a/tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh index 2152b9cc57c..87cd4f6ba95 100755 --- a/tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/privacy/central/test_scripts/_compile.sh @@ -3,11 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 + source ${ZEPHYR_BASE}/tests/bsim/compile.source app="$(guess_test_relpath)" _compile diff --git a/tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh index 2152b9cc57c..a8e0fb1530e 100755 --- a/tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/privacy/device/test_scripts/_compile.sh @@ -1,13 +1,11 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 + source ${ZEPHYR_BASE}/tests/bsim/compile.source app="$(guess_test_relpath)" _compile diff --git a/tests/bsim/bluetooth/host/privacy/legacy/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/legacy/test_scripts/_compile.sh index 2152b9cc57c..a8e0fb1530e 100755 --- a/tests/bsim/bluetooth/host/privacy/legacy/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/privacy/legacy/test_scripts/_compile.sh @@ -1,13 +1,11 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 + source ${ZEPHYR_BASE}/tests/bsim/compile.source app="$(guess_test_relpath)" _compile diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh index 0f0ca567252..47da5e42c62 100755 --- a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh @@ -1,12 +1,9 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh index ca70f8349ff..7bb547b3f25 100755 --- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh @@ -1,12 +1,9 @@ #!/usr/bin/env bash # Copyright 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu - : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh index 5fb4d1a3db3..b3605e1ee2b 100755 --- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh @@ -1,12 +1,11 @@ #!/usr/bin/env bash # Copyright 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source + app="$(guess_test_relpath)" _compile diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/bond_per_connection/test_scripts/_compile.sh index 4cdee31addb..a8e0fb1530e 100755 --- a/tests/bsim/bluetooth/host/security/bond_per_connection/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/bond_per_connection/test_scripts/_compile.sh @@ -1,12 +1,11 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source + app="$(guess_test_relpath)" _compile diff --git a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/_compile.sh index 593ef45dfc1..e33fe48bdbe 100755 --- a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/_compile.sh @@ -1,11 +1,9 @@ #!/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/security/compile.sh b/tests/bsim/bluetooth/host/security/compile.sh index 4930a817616..9296cd8e4c1 100755 --- a/tests/bsim/bluetooth/host/security/compile.sh +++ b/tests/bsim/bluetooth/host/security/compile.sh @@ -6,16 +6,7 @@ #set -x #uncomment this line for debugging set -ue - -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/id_addr_update/test_scripts/_compile.sh index 00c33e102ce..f0f386a9e6b 100755 --- a/tests/bsim/bluetooth/host/security/id_addr_update/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/id_addr_update/test_scripts/_compile.sh @@ -1,11 +1,9 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/_compile.sh b/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/_compile.sh index 4cdee31addb..a8e0fb1530e 100755 --- a/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/_compile.sh +++ b/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/_compile.sh @@ -1,12 +1,11 @@ #!/usr/bin/env bash # Copyright 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 - set -eu : "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" INCR_BUILD=1 source ${ZEPHYR_BASE}/tests/bsim/compile.source + app="$(guess_test_relpath)" _compile diff --git a/tests/bsim/bluetooth/ll/cis/compile.sh b/tests/bsim/bluetooth/ll/cis/compile.sh index 3db63a86c8b..b3b8379497c 100755 --- a/tests/bsim/bluetooth/ll/cis/compile.sh +++ b/tests/bsim/bluetooth/ll/cis/compile.sh @@ -6,15 +6,7 @@ #set -x #uncomment this line for debugging set -ue -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/ll/compile.sh b/tests/bsim/bluetooth/ll/compile.sh index 89f4c7b55dd..487e34da4ab 100755 --- a/tests/bsim/bluetooth/ll/compile.sh +++ b/tests/bsim/bluetooth/ll/compile.sh @@ -6,15 +6,7 @@ #set -x #uncomment this line for debugging set -ue -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/bluetooth/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh index de112f96afc..aa86e6ccb25 100755 --- a/tests/bsim/bluetooth/mesh/compile.sh +++ b/tests/bsim/bluetooth/mesh/compile.sh @@ -6,14 +6,7 @@ #set -x #uncomment this line for debugging set -ue -: "${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_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" - -mkdir -p ${WORK_DIR} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source diff --git a/tests/bsim/compile.sh b/tests/bsim/compile.sh index 2b0e0a76a27..3b1a7dce635 100755 --- a/tests/bsim/compile.sh +++ b/tests/bsim/compile.sh @@ -7,16 +7,7 @@ #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} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/drivers/uart/compile.sh b/tests/bsim/drivers/uart/compile.sh index 5bd35772bb5..502916b20b9 100755 --- a/tests/bsim/drivers/uart/compile.sh +++ b/tests/bsim/drivers/uart/compile.sh @@ -7,16 +7,7 @@ #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} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/net/compile.sh b/tests/bsim/net/compile.sh index e134d7ee5d6..a0338de4c6f 100755 --- a/tests/bsim/net/compile.sh +++ b/tests/bsim/net/compile.sh @@ -7,16 +7,7 @@ #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} +: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source