From 0c10fe659a4e5bb746d6f759ce0f00752fe0a127 Mon Sep 17 00:00:00 2001 From: Milosz Wasilewski Date: Tue, 20 May 2025 08:09:15 +0100 Subject: [PATCH] Fix shellcheck warnings and errors This patch fixes all shellcheck warnings and errors in existing shell scripts. Shellcheck should not display any issues when run with the following parameters shellcheck -S warning -e SC1091 SC2230 SC3043 Shellcheck version 0.9.0 was used for this patch. Signed-off-by: Milosz Wasilewski --- Runner/init_env | 10 +- Runner/run-test.sh | 12 +-- .../FunctionalArea/baseport/BWMON/run.sh | 8 +- .../FunctionalArea/baseport/Buses/run.sh | 9 +- .../baseport/CPUFreq_Validation/run.sh | 6 +- .../Kernel/FunctionalArea/baseport/GIC/run.sh | 7 +- .../Kernel/FunctionalArea/baseport/IPA/run.sh | 5 +- .../FunctionalArea/baseport/IPCC/run.sh | 7 +- .../FunctionalArea/baseport/Interrupts/run.sh | 8 +- .../FunctionalArea/baseport/MEMLAT/run.sh | 8 +- .../FunctionalArea/baseport/RMNET/run.sh | 5 +- .../baseport/Reboot_health_check/run.sh | 10 +- .../FunctionalArea/baseport/Timer/run.sh | 9 +- .../baseport/adsp_remoteproc/run.sh | 7 +- .../baseport/cdsp_remoteproc/run.sh | 7 +- .../FunctionalArea/baseport/hotplug/run.sh | 7 +- .../FunctionalArea/baseport/iommu/run.sh | 7 +- .../Kernel/FunctionalArea/baseport/irq/run.sh | 7 +- .../FunctionalArea/baseport/kaslr/run.sh | 9 +- .../FunctionalArea/baseport/pinctrl/run.sh | 7 +- .../FunctionalArea/baseport/qcrypto/run.sh | 13 +-- .../FunctionalArea/baseport/remoteproc/run.sh | 7 +- .../FunctionalArea/baseport/rngtest/run.sh | 7 +- .../FunctionalArea/baseport/smmu/run.sh | 7 +- .../FunctionalArea/baseport/storage/run.sh | 7 +- .../FunctionalArea/baseport/watchdog/run.sh | 7 +- .../baseport/wpss_remoteproc/run.sh | 7 +- Runner/suites/Multimedia/DSP_AudioPD/run.sh | 8 +- Runner/suites/Multimedia/Graphics/run.sh | 4 +- Runner/utils/basics.sh | 95 +++++++++++-------- Runner/utils/functestlib.sh | 8 +- 31 files changed, 184 insertions(+), 141 deletions(-) diff --git a/Runner/init_env b/Runner/init_env index f37ed205..6345dbdb 100755 --- a/Runner/init_env +++ b/Runner/init_env @@ -1,7 +1,11 @@ +#!/bin/sh # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear # Source this file to setup the test suite environment -export BASEDIR=$(pwd) -export TOOLS=$(pwd)/utils -export SUITES=$(pwd)/suites +BASEDIR=$(pwd) +export BASEDIR +TOOLS=$(pwd)/utils +export TOOLS +SUITES=$(pwd)/suites +export SUITES diff --git a/Runner/run-test.sh b/Runner/run-test.sh index 563a3f89..b4f4f416 100755 --- a/Runner/run-test.sh +++ b/Runner/run-test.sh @@ -1,12 +1,13 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh # Find test case path by name @@ -16,8 +17,8 @@ find_test_case_by_name() { # Get the directory name dir_name_in_dir=${1##*/} - # Check if the directory name matches the user input (ignoring case) - if [ "${dir_name_in_dir,,}" = "$test_name" ]; then + # Check if the directory name matches the user input + if [ "${dir_name_in_dir}" = "$test_name" ]; then # Get the absolute path of the directory abs_path=$(readlink -f "$1") echo "$abs_path" @@ -53,7 +54,6 @@ execute_test_case() { # Function to run a specific test case by name run_specific_test_by_name() { test_name="$1" - test_name=${test_name,,} test_path=$(find_test_case_by_name ".") if [ -z "$test_path" ]; then log "Test case with name $test_name not found." diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/BWMON/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/BWMON/run.sh index 9b933ece..0bbedf10 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/BWMON/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/BWMON/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="BWMON" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "--------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" @@ -41,6 +42,7 @@ log_info "Comparing votes" incremented=true +# shellcheck disable=SC2046 for i in $(seq 2 $(echo "$initial_votes" | wc -l)); do initial_vote=$(echo "$initial_votes" | sed -n "${i}p") final_vote=$(echo "$final_votes" | sed -n "${i}p") diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/Buses/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/Buses/run.sh index a08afa34..29a15389 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/Buses/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/Buses/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="Buses" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" @@ -26,4 +27,4 @@ else log_fail "$TESTNAME : Test Failed" echo "$TESTNAME FAIL" > $test_path/$TESTNAME.res fi -log_info "-------------------Completed $TESTNAME Testcase----------------------------" \ No newline at end of file +log_info "-------------------Completed $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/run.sh index f2ed171b..baf1c871 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/run.sh @@ -1,9 +1,9 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh - -. "$(pwd)/init_env" +. "${PWD}/init_env" TESTNAME="CPUFreq_Validation" . "$TOOLS/functestlib.sh" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/GIC/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/GIC/run.sh index 04e55ef5..27b20e3c 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/GIC/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/GIC/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="GIC" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/IPA/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/IPA/run.sh index ab423cf5..9daaae90 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/IPA/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/IPA/run.sh @@ -1,9 +1,10 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="IPA" . "$TOOLS/functestlib.sh" test_path=$(find_test_case_by_name "$TESTNAME") diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/IPCC/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/IPCC/run.sh index ada89a0f..74352f53 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/IPCC/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/IPCC/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="IPCC" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "--------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/Interrupts/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/Interrupts/run.sh index ad6a9031..28e5ebd8 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/Interrupts/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/Interrupts/run.sh @@ -1,14 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="Interrupts" #import test functions library -. $TOOLS/functestlib.sh -test_path=$(find_test_case_by_name "$TESTNAME") +. "${TOOLS}"/functestlib.sh log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/MEMLAT/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/MEMLAT/run.sh index 58c9b4a6..a963e25d 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/MEMLAT/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/MEMLAT/run.sh @@ -1,12 +1,13 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="MEMLAT" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") test_bin_path=$(find_test_case_bin_by_name "lat_mem_rd") log_info "-----------------------------------------------------------------------------------------" @@ -37,6 +38,7 @@ wait log_info "Comparing votes..." incremented=true +# shellcheck disable=SC2046 for i in $(seq 1 $(echo "$initial_votes" | wc -l)); do initial_vote=$(echo "$initial_votes" | sed -n "${i}p") final_vote=$(echo "$final_votes" | sed -n "${i}p") diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/RMNET/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/RMNET/run.sh index ee6197a0..f88a7ac3 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/RMNET/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/RMNET/run.sh @@ -1,9 +1,10 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="RMNET" . "$TOOLS/functestlib.sh" test_path=$(find_test_case_by_name "$TESTNAME") diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/run.sh index 3b96a2b3..8607033f 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/run.sh @@ -1,17 +1,15 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env -TESTNAME="Reboot_health_check" +. "{PWD}"/init_env #import test functions library -. $TOOLS/functestlib.sh -test_path=$(find_test_case_by_name "$TESTNAME") +. "${TOOLS}"/functestlib.sh # Directory for health check files HEALTH_DIR="/var/reboot_health" -LOG_FILE="$HEALTH_DIR/reboot_test.log" RETRY_FILE="$HEALTH_DIR/reboot_retry_count" MAX_RETRIES=3 diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/Timer/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/Timer/run.sh index 3c7cd31c..3f6be00a 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/Timer/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/Timer/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="Timer" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" @@ -21,7 +22,7 @@ BINARY_PATH="/var/common/bins/timers/posix_timers" OUTPUT=$($BINARY_PATH) # Check if "pass:7" is in the output -if [[ $OUTPUT == *"pass:7"* ]]; then +if echo "${OUTPUT}" | grep "pass:7"; then log_pass "$TESTNAME : Test Passed" echo "$TESTNAME PASS" > $test_path/$TESTNAME.res else diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/adsp_remoteproc/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/adsp_remoteproc/run.sh index 33e7e3cb..8f0044c3 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/adsp_remoteproc/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/adsp_remoteproc/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="adsp_remoteproc" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "--------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/cdsp_remoteproc/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/cdsp_remoteproc/run.sh index 595475ab..8c060558 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/cdsp_remoteproc/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/cdsp_remoteproc/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="cdsp_remoteproc" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/hotplug/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/hotplug/run.sh index c086b497..4de0bdff 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/hotplug/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/hotplug/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="hotplug" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "--------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/iommu/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/iommu/run.sh index 422fae8f..c63d68af 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/iommu/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/iommu/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="iommu" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "--------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/irq/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/irq/run.sh index 40898abf..c46b4b4e 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/irq/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/irq/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="irq" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/kaslr/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/kaslr/run.sh index 8d17d479..95bd1029 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/kaslr/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/kaslr/run.sh @@ -1,12 +1,13 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="kaslr" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "--------------------------------------------------------------------------" @@ -19,7 +20,7 @@ value=$(echo $output | awk '{print $1}') -if [ $value == "0000000000000000" ]; then +if [ $value = "0000000000000000" ]; then log_pass "$TESTNAME : Test Passed" echo "$TESTNAME PASS" > $test_path/$TESTNAME.res else diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/pinctrl/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/pinctrl/run.sh index 7dd7e19d..e84b9f19 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/pinctrl/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/pinctrl/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="pinctrl" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/qcrypto/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/qcrypto/run.sh index 72b459c8..7618c8bb 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/qcrypto/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/qcrypto/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="qcrypto" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" @@ -16,11 +17,11 @@ log_info "Checking if dependency binary is available" check_dependencies kcapi-convience kcapi-convience +KCAPI_RET=$? -echo $? - +echo "${KCAPI_RET}" -if [ $? -eq 0 ]; then +if [ ${KCAPI_RET} -eq 0 ]; then log_pass "$TESTNAME : Test Passed" echo "$TESTNAME PASS" > $test_path/$TESTNAME.res else diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/remoteproc/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/remoteproc/run.sh index 6d6c86ef..31784117 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/remoteproc/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/remoteproc/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="remoteproc" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh index bfa74d29..7ba3a921 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="rngtest" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/smmu/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/smmu/run.sh index 655debc6..3811cce2 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/smmu/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/smmu/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="smmu" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/storage/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/storage/run.sh index bcac1131..21a7c902 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/storage/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/storage/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="storage" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/watchdog/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/watchdog/run.sh index ae50f0a9..44afa087 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/watchdog/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/watchdog/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="watchdog" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "--------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/run.sh index a8f563a8..af3de0ce 100755 --- a/Runner/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/run.sh +++ b/Runner/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/run.sh @@ -1,13 +1,14 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear -#!/bin/sh # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env TESTNAME="wpss_remoteproc" #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh test_path=$(find_test_case_by_name "$TESTNAME") log_info "-----------------------------------------------------------------------------------------" log_info "-------------------Starting $TESTNAME Testcase----------------------------" diff --git a/Runner/suites/Multimedia/DSP_AudioPD/run.sh b/Runner/suites/Multimedia/DSP_AudioPD/run.sh index a94ea886..e283c919 100755 --- a/Runner/suites/Multimedia/DSP_AudioPD/run.sh +++ b/Runner/suites/Multimedia/DSP_AudioPD/run.sh @@ -13,7 +13,7 @@ log_info "Checking if dependency binary is available" check_dependencies adsprpcd adsprpcd & -PID = $! +PID=$! if [ -z "$PID" ]; then echo "Failed to start the binary" @@ -23,10 +23,10 @@ else fi check_stack_trace() { - local pid = $1 - if cat /proc/$pid/stack 2>/dev/null | grep -q "do_sys_poll" + local pid=$1 + if cat /proc/$pid/stack 2>/dev/null | grep -q "do_sys_poll"; then return 0 - else + else return 1 fi } diff --git a/Runner/suites/Multimedia/Graphics/run.sh b/Runner/suites/Multimedia/Graphics/run.sh index f7f96f63..d6215980 100755 --- a/Runner/suites/Multimedia/Graphics/run.sh +++ b/Runner/suites/Multimedia/Graphics/run.sh @@ -18,11 +18,11 @@ dmesg -c cat /dev/dri/card0 & OUTPUT=$(dmesg) -if [ $OUTPUT == *"Loaded GMU firmware"* ]; then +if echo "${OUTPUT}" | grep "Loaded GMU firmware"; then log_pass "$TESTNAME : Test Passed" echo "$TESTNAME : Test Passed" > $test_path/$TESTNAME.res else log_fail "$TESTNAME : Test Failed" echo "$TESTNAME : Test Failed" > $test_path/$TESTNAME.res fi -log_info "-------------------Completed $TESTNAME Testcase----------------------------" \ No newline at end of file +log_info "-------------------Completed $TESTNAME Testcase----------------------------" diff --git a/Runner/utils/basics.sh b/Runner/utils/basics.sh index 17bf7779..6a1d99a2 100755 --- a/Runner/utils/basics.sh +++ b/Runner/utils/basics.sh @@ -1,14 +1,16 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env #import platform -. $TOOLS/platform.sh +. "${TOOLS}"/platform.sh #import test functions library -. $TOOLS/functestlib.sh +. "${TOOLS}"/functestlib.sh # CPU_FAST CPU_SLOW FTRACE_START_MARKER are used by the ftrace libraries @@ -17,6 +19,7 @@ LOAD_GENERATOR=$TOOLS/tasklibrary FTRACE_ANALYZER_EXE=$TOOLS/ftrace TRACE_CMD_EXE=$TOOLS/trace-cmd BIG_LITTLE_SWITCH_SO=$TOOLS/libbiglittleswitch.so.1.0.0 +export BIG_LITTLE_SWITCH_SO HOG_CPU=$TOOLS/affinity_tools TASKSET=$TOOLS/affinity_tools CONFIG_FTRACE_EVENTS="-e sched:*" @@ -28,25 +31,25 @@ IMPLEMENTER=0x41 #A7 default_little_cpulist HMPSLOWCPUS=$__RET -littlecore=`echo $HMPSLOWCPUS|busybox awk {'print $1'}` +littlecore=$(echo "${HMPSLOWCPUS}"|busybox awk '{print $1}') CONFIG_TARGET_LITTLE_CPUPART=$( cpupart $littlecore ) PART_SLOW=`echo $CONFIG_TARGET_LITTLE_CPUPART` #A15 default_big_cpulist HMPFASTCPUS=$__RET -bigcore=`echo $HMPFASTCPUS|busybox awk {'print $1'}` +bigcore=$(echo "${HMPFASTCPUS}"|busybox awk '{print $1}') CONFIG_TARGET_BIG_CPUPART=$( cpupart $bigcore ) PART_FAST=`echo $CONFIG_TARGET_BIG_CPUPART` commaslow= commafast= for cpu in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 21 22 23 24 25 26 ; do $TASKSET -part $cpu,$IMPLEMENTER,$PART_SLOW >/dev/null - if [ $? == 0 ] ; then + if [ $? = 0 ] ; then CPU_SLOW=$CPU_SLOW$commaslow$cpu commaslow=, fi $TASKSET -part $cpu,$IMPLEMENTER,$PART_FAST >/dev/null - if [ $? == 0 ] ; then + if [ $? = 0 ] ; then CPU_FAST=$CPU_FAST$commafast$cpu commafast=, fi @@ -61,28 +64,34 @@ fi UP_THRESHOLD_1024=$(cat '/proc/sys/kernel/sched_upmigrate' | cut -f 1) DOWN_THRESHOLD_1024=$(cat '/proc/sys/kernel/sched_downmigrate' | cut -f 1) -let UP_THRESHOLD=$UP_THRESHOLD_1024*100/1024 -let DOWN_THRESHOLD=$DOWN_THRESHOLD_1024*100/1024 -let UNDER_DOWN_THRESHOLD=$DOWN_THRESHOLD_1024*50/1024 -let LITTLE_THRESHOLD=$DOWN_THRESHOLD*70/100 -let NOCHANGE_THRESHOLD=\($DOWN_THRESHOLD_1024+$UP_THRESHOLD_1024\)*100/1024/2 -let BIG_THRESHOLD=$UP_THRESHOLD*130/100 -let THRESHOLD_TOLERANCE=15 +UP_THRESHOLD=$((UP_THRESHOLD_1024*100/1024)) +DOWN_THRESHOLD=$((DOWN_THRESHOLD_1024*100/1024)) +UNDER_DOWN_THRESHOLD=$((DOWN_THRESHOLD_1024*50/1024)) +export UNDER_DOWN_THRESHOLD +LITTLE_THRESHOLD=$((DOWN_THRESHOLD*70/100)) +export LITTLE_THRESHOLD +NOCHANGE_THRESHOLD=$((\($DOWN_THRESHOLD_1024+$UP_THRESHOLD_1024\)*100/1024/2)) +BIG_THRESHOLD=$((UP_THRESHOLD*130/100)) +export BIG_THRESHOLD +THRESHOLD_TOLERANCE=15 # separate down threshold as test load is +/- 10% accurate at best -let NODOWN_THRESHOLD=$NOCHANGE_THRESHOLD +NODOWN_THRESHOLD=$NOCHANGE_THRESHOLD if [ "$NODOWN_THRESHOLD" -lt "$(($DOWN_THRESHOLD+$THRESHOLD_TOLERANCE))" ] ; then NODOWN_THRESHOLD=$(($DOWN_THRESHOLD+$THRESHOLD_TOLERANCE)) echo "Setting NODOWN_THRESHOLD to $NODOWN_THRESHOLD" fi # separate up threshold as test load is +/- 10% accurate at best -let NOUP_THRESHOLD=$NOCHANGE_THRESHOLD +NOUP_THRESHOLD=$NOCHANGE_THRESHOLD if [ "$NOUP_THRESHOLD" -gt "$(($UP_THRESHOLD-$THRESHOLD_TOLERANCE))" ] ; then NOUP_THRESHOLD=$(($UP_THRESHOLD-$THRESHOLD_TOLERANCE)) echo "Setting NOUP_THRESHOLD to $NOUP_THRESHOLD" fi CUTOFF_PRIORITY_GT=-5 +export CUTOFF_PRIORITY_GT CUTOFF_PRIORITY_LT=2 +export CUTOFF_PRIORITY_LT TIME_ERROR_MS=100 +export TIME_ERROR_MS HOG_PID= copy_trace_events() @@ -95,14 +104,14 @@ copy_trace_events() echo "Copying trace events..." odir=`pwd` - cd /sys/kernel/debug/tracing/events + cd /sys/kernel/debug/tracing/events || exit 1 mkdir $FTRACE_EVENTS for i in * ; do if [ -f $i ] ; then cat $i > $FTRACE_EVENTS/$i else old=`pwd` - cd $i + cd $i || exit 1 mkdir $FTRACE_EVENTS/$i/ for j in * ; do if [ -f $j/format ] ; then @@ -110,10 +119,10 @@ copy_trace_events() cat $j/format > $FTRACE_EVENTS/$i/$j/format fi done - cd $old + cd $old || exit 1 fi done - cd $odir + cd $odir || exit 1 TRACE_EVENTS_PATH=$FTRACE_EVENTS } @@ -177,23 +186,29 @@ calibrate_tasklib() # calibration file once it is called by a test, even for the first time. calibrate_tasklib +taskset_sleep() +{ + sleep 1 + taskset_cpuany $RESULT +} + load_generator() { echo "Using tasklibrary calibdation file: $CALIBRATION" $LOAD_GENERATOR --calibfile=$CALIBRATION --loadseq=$1 & RESULT=$! - if [ "$2" == "START_SLOW" ] ; then + if [ "$2" = "START_SLOW" ] ; then taskset_cpuslow $RESULT - for ii in 0 ; do sleep 1; taskset_cpuany $RESULT ; done & + taskset_sleep & fi - if [ "$2" == "START_FAST" ] ; then + if [ "$2" = "START_FAST" ] ; then taskset_cpufast $RESULT - for ii in 0 ; do sleep 1; taskset_cpuany $RESULT ; done & + taskset_sleep & fi - if [ "$2" == "STARTSTOP_SLOW" ] ; then + if [ "$2" = "STARTSTOP_SLOW" ] ; then taskset_cpuslow $RESULT fi - if [ "$2" == "STARTSTOP_FAST" ] ; then + if [ "$2" = "STARTSTOP_FAST" ] ; then taskset_cpufast $RESULT fi echo "#load_generator PID=$RESULT COMMAND=$1" @@ -214,10 +229,10 @@ ftrace_start() FTRACE_OLD_GOV="" while [ $i != 9999 ] ; do temp="` cat /sys/devices/system/cpu/cpu$i/cpufreq/scaling_governor 2>/dev/null`" - if [ "$temp" == "" ] ; then + if [ "$temp" = "" ] ; then i=9999 else - let i=$i+1 + i=$(($i+1)) FTRACE_OLD_GOV="$FTRACE_OLD_GOV $temp" fi done @@ -226,11 +241,11 @@ ftrace_start() i=0 while [ $i != 9999 ] ; do temp="` cat /sys/devices/system/cpu/cpu$i/cpufreq/scaling_governor 2>/dev/null`" - if [ "$temp" == "" ] ; then + if [ "$temp" = "" ] ; then i=9999 else echo performance > /sys/devices/system/cpu/cpu$i/cpufreq/scaling_governor - let i=$i+1 + i=$(($i+1)) fi done fi @@ -257,7 +272,7 @@ ftrace_stop() echo "Tracing stopped" rm $FTRACE_FILE 2>/dev/null - if [ "$CONFIG_FTRACE_BINARY" == "n" ] ; then + if [ "$CONFIG_FTRACE_BINARY" = "n" ] ; then echo "Extracting ASCII trace buffer..." $TRACE_CMD_EXE show > $FTRACE_FILE 2>/dev/null else @@ -273,7 +288,7 @@ ftrace_stop() i=0 for value in $FTRACE_OLD_GOV ; do echo $value > /sys/devices/system/cpu/cpu$i/cpufreq/scaling_governor - let i=$i+1 + i=$(($i+1)) done fi @@ -319,7 +334,7 @@ ftrace_check() commandline="$commandline CPU_SLOW=$CPU_SLOW" commandline="$commandline $FTRACE_ANALYZER_EXE -l $1 -t $FTRACE_FILE" echo "# $commandline" - if [ "$CONFIG_FTRACE_BINARY" == "y" ] ; then + if [ "$CONFIG_FTRACE_BINARY" = "y" ] ; then $TRACE_CMD_EXE report -i $FTRACE_FILE > trace.txt 2>/dev/null $FTRACE_ANALYZER_EXE -l $1 -t trace.txt RESULT0=$? @@ -334,7 +349,7 @@ ftrace_check() # remove ftrace files if it was a success to limit # space used on sdcard. - if [ "x$CONFIG_FTRACE_CLEANUP" == "xy" -a "$RESULT0" == "0" ] ; then + if [ "x$CONFIG_FTRACE_CLEANUP" = "xy" ] && [ "$RESULT0" = "0" ] ; then rm $FTRACE_FILE else gzip $FTRACE_FILE @@ -346,8 +361,8 @@ get_task_pid() { TRACE=$1 TASK_NAME=$2 - TASK=`awk -v PATTERN="$TASK_NAME-([0-9]+)" '$1 ~ PATTERN {print $1; exit 0;}' $TRACE` - TASK_PID=${TASK/${TASK_NAME}-/} + TASK=$(awk -v PATTERN="$TASK_NAME-([0-9]+)" '$1 ~ PATTERN {print $1; exit 0;}' $TRACE) + TASK_PID=$(echo "${TASK}" | sed "s/${TASK_NAME}-//") echo "Found task [$TASK_NAME] PID: $TASK_PID" RESULT=$TASK_PID @@ -359,7 +374,7 @@ ftrace_check_tasks() export TRACE_TASKS # Generate TXT file required for analysis - if [ "$CONFIG_FTRACE_BINARY" == "y" ] ; then + if [ "$CONFIG_FTRACE_BINARY" = "y" ] ; then $TRACE_CMD_EXE report -i $FTRACE_FILE > trace.txt 2>/dev/null mv $FTRACE_FILE $FTRACE_FILE.bin mv trace.txt $FTRACE_FILE @@ -369,7 +384,7 @@ ftrace_check_tasks() for TASK in $TRACE_TASKS; do get_task_pid $FTRACE_FILE $TASK TASK_PID=$RESULT - PIDS+="$TASK_PID," + PIDS="${PIDS},$TASK_PID" done echo "Computing CPUs usages for PIDs: $PIDS" @@ -390,14 +405,14 @@ ftrace_check_tasks() RESULT0=$? # Recover original binary file - if [ "$CONFIG_FTRACE_BINARY" == "y" ] ; then + if [ "$CONFIG_FTRACE_BINARY" = "y" ] ; then rm $FTRACE_FILE mv $FTRACE_FILE.bin $FTRACE_FILE fi # remove ftrace files if it was a success to limit # space used on sdcard. - if [ "x$CONFIG_FTRACE_CLEANUP" == "xy" -a "$RESULT0" == "0" ] ; then + if [ "x$CONFIG_FTRACE_CLEANUP" = "xy" ] && [ "$RESULT0" = "0" ] ; then rm $FTRACE_FILE else gzip $FTRACE_FILE diff --git a/Runner/utils/functestlib.sh b/Runner/utils/functestlib.sh index 93d60c4e..a4a578b2 100755 --- a/Runner/utils/functestlib.sh +++ b/Runner/utils/functestlib.sh @@ -1,10 +1,12 @@ +#!/bin/sh + # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. # SPDX-License-Identifier: BSD-3-Clause-Clear # Import test suite definitions -. $(pwd)/init_env +. "${PWD}"/init_env #import platform -. $TOOLS/platform.sh +. "${TOOLS}"/platform.sh __RUNNER_SUITES_DIR="/var/Runner/suites" __RUNNER_UTILS_BIN_DIR="/var/common" @@ -37,7 +39,7 @@ find_test_case_script_by_name() { check_dependencies() { local missing=0 for cmd in "$@"; do - if ! command -v "$cmd" &>/dev/null; then + if ! command -v "$cmd" > /dev/null 2>&1; then log_error "ERROR: Required command '$cmd' not found in PATH." missing=1 fi