From ed4f3cd3547ec04bd263ea2b190c533df70c5f23 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Fri, 22 Nov 2019 21:01:27 +0100 Subject: [PATCH] bsim_bt: basic_conn_split.sh: Use lowercase for internal vars This makes it possible to tell at a glance which variables are internal to the script and which ones are parameters to it, which is very helpful. This convention is pretty common. See e.g. Google's shell style guide at https://google.github.io/styleguide/shell.xml#Naming_Conventions, and https://github.com/icy/bash-coding-style#naming-and-styles. It's older than those though. Signed-off-by: Ulf Magnusson --- .../tests_scripts/basic_conn_split.sh | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/tests_scripts/basic_conn_split.sh b/tests/bluetooth/bsim_bt/bsim_test_app/tests_scripts/basic_conn_split.sh index 290e652a629..9b21312a8b2 100755 --- a/tests/bluetooth/bsim_bt/bsim_test_app/tests_scripts/basic_conn_split.sh +++ b/tests/bluetooth/bsim_bt/bsim_test_app/tests_scripts/basic_conn_split.sh @@ -4,9 +4,9 @@ # Basic connection test: a central connects to a peripheral and expects a # notification, using the split controller (ULL LLL) -SIMULATION_ID="basic_conn_split" -VERBOSITY_LEVEL=2 -PROCESS_IDS=""; EXIT_CODE=0 +simulation_id="basic_conn_split" +verbosity_level=2 +process_ids=""; exit_code=0 function Execute(){ if [ ! -f $1 ]; then @@ -14,7 +14,7 @@ function Execute(){ compile it?)\e[39m" exit 1 fi - timeout 5 $@ & PROCESS_IDS="$PROCESS_IDS $!" + timeout 5 $@ & process_ids="$process_ids $!" } : "${BSIM_OUT_PATH:?BSIM_OUT_PATH must be defined}" @@ -25,17 +25,17 @@ BOARD="${BOARD:-nrf52_bsim}" cd ${BSIM_OUT_PATH}/bin Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_app_prj_split_conf \ - -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -RealEncryption=0 \ + -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=0 \ -testid=peripheral -rs=23 Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_app_prj_split_conf\ - -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -RealEncryption=0 \ + -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \ -testid=central -rs=6 -Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \ +Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \ -D=2 -sim_length=20e6 $@ -for PROCESS_ID in $PROCESS_IDS; do - wait $PROCESS_ID || let "EXIT_CODE=$?" +for process_id in $process_ids; do + wait $process_id || let "exit_code=$?" done -exit $EXIT_CODE #the last exit code != 0 +exit $exit_code #the last exit code != 0