michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests bsim: Move common scripts one level up

Browse source 
These scripts are common for bluetooth and other tests
Let's move them one level up.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2023-03-20 11:08:34 +01:00 • committed by Fabio Baltieri
commit f2d9b74da1
15 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/bluetooth-tests.yaml vendored
View file

@ -70,9 +70,9 @@ jobs:
- name: Run Bluetooth Tests with BSIM
run: |
export ZEPHYR_BASE=${PWD}
WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/bluetooth/compile.sh
WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/compile.sh
RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_test_results_file} \
SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/bluetooth/run_parallel.sh
SEARCH_PATH=tests/bsim/ tests/bsim/run_parallel.sh
- name: Upload Test Results
if: always()

6
tests/bsim/bluetooth/README.txt → tests/bsim/README.txt
View file

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

2
tests/bsim/bluetooth/_compile_permutate_kconfigs.sh
View file

@ -21,7 +21,7 @@ BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
mkdir -p ${WORK_DIR}
source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source
source ${ZEPHYR_BASE}/tests/bsim/compile.source
declare -a list=(

2
tests/bsim/bluetooth/audio/compile.sh
View file

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

2
tests/bsim/bluetooth/host/att/mtu_update/test_scripts/_compile.sh
View file

@ -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/bsim/bluetooth/compile.source
source ${ZEPHYR_BASE}/tests/bsim/compile.source
app="tests/bsim/bluetooth/$test_name" compile

2
tests/bsim/bluetooth/host/compile.sh
View file

@ -18,7 +18,7 @@ BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
mkdir -p ${WORK_DIR}
source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source
source ${ZEPHYR_BASE}/tests/bsim/compile.source
app=tests/bsim/bluetooth/host/adv/resume compile
app=tests/bsim/bluetooth/host/adv/resume conf_file=prj_2.conf compile

2
tests/bsim/bluetooth/host/security/bond_overwrite_allowed/test_scripts/_compile.sh
View file

@ -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/bsim/bluetooth/compile.source
source ${ZEPHYR_BASE}/tests/bsim/compile.source
app="tests/bsim/bluetooth/$test_name" compile

2
tests/bsim/bluetooth/host/security/bond_overwrite_denied/test_scripts/_compile.sh
View file

@ -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/bsim/bluetooth/compile.source
source ${ZEPHYR_BASE}/tests/bsim/compile.source
app="tests/bsim/bluetooth/$test_name" compile

2
tests/bsim/bluetooth/ll/compile.sh
View file

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

4
tests/bsim/bluetooth/ll/edtt/README.txt
View file

@ -53,10 +53,10 @@ In short the whole process being:
```
cd ${ZEPHYR_BASE} && source zephyr-env.sh
#Compile all apps:
WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/bluetooth/compile.sh
WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/bluetooth/ll/compile.sh
#run all tests
RESULTS_FILE=${ZEPHYR_BASE}/banana.xml SEARCH_PATH=tests/bsim/bluetooth/ll/edtt/ tests/bsim/bluetooth/run_parallel.sh
RESULTS_FILE=${ZEPHYR_BASE}/banana.xml SEARCH_PATH=tests/bsim/bluetooth/ll/edtt/ tests/bsim/run_parallel.sh
#or just run one set:
tests/bsim/bluetooth/ll/edtt/tests_scripts/hci.sh

2
tests/bsim/bluetooth/mesh/compile.sh
View file

@ -18,7 +18,7 @@ BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
mkdir -p ${WORK_DIR}
source ${ZEPHYR_BASE}/tests/bsim/bluetooth/compile.source
source ${ZEPHYR_BASE}/tests/bsim/compile.source
app=tests/bsim/bluetooth/mesh compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile

2
tests/bsim/bluetooth/compile.sh → tests/bsim/compile.sh
View file

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

2
tests/bsim/bluetooth/compile.source → tests/bsim/compile.source
View file

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

0
tests/bsim/bluetooth/run_parallel.sh → tests/bsim/run_parallel.sh
View file

0
tests/bsim/bluetooth/sh_common.source → tests/bsim/sh_common.source
View file