michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests/bsim/common sh: Improve getting test name/relative path

Browse source 
Improve function which guesses the test name so the calling
script can be invoked from any folder, not just Zephyr's
base.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2024-04-04 08:43:39 +02:00 • committed by Anas Nashif
commit 936598ddf1
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/bsim/sh_common.source
View file

@ -50,18 +50,21 @@ function Execute() {
} }
function _guess_test_relpath(){ function _guess_test_relpath(){
local PA="$(realpath --relative-to "${ZEPHYR_BASE}" $(dirname "${BASH_SOURCE[2]}"))" local PA="$(cd -- "$(dirname "${BASH_SOURCE[2]}")" && pwd)"
PA="$(realpath --relative-to "${ZEPHYR_BASE}" "${PA}")"
echo $PA | sed -E 's/\/tests?_scripts//' echo $PA | sed -E 's/\/tests?_scripts//'
} }
# For a caller running from a tests_script/ folder, get the path of its parent # For a caller running from a tests_script/ folder, get the path of its parent
# relative to $ZEPHYR_BASE # relative to $ZEPHYR_BASE
# This must be run without/before cd'ing into another directory
function guess_test_relpath(){ function guess_test_relpath(){
echo $(_guess_test_relpath) echo $(_guess_test_relpath)
} }
# For a caller running from a tests_script/ folder, get the path of its parent # For a caller running from a tests_script/ folder, get the path of its parent
# relative to $ZEPHYR_BASE, replacing "/" with "_" # relative to $ZEPHYR_BASE, replacing "/" with "_"
# This must be run without/before cd'ing into another directory
function guess_test_long_name(){ function guess_test_long_name(){
echo $(_guess_test_relpath) | tr / _ echo $(_guess_test_relpath) | tr / _
} }