run.sh: add robust path resolution for testkit compatibility

- Updated all run.sh scripts to dynamically locate testkit root using utils/ and suites/ markers
- Replaced hardcoded relative paths with SCRIPT_DIR and ROOT_DIR detection logic
- Ensures consistent behavior across local, CI, and target environments
- Retains compatibility with functestlib.sh and init_env

Signed-off-by: Srikanth Muppandam <[email protected]>

Author: smuppand

Runner/suites/Kernel/FunctionalArea/baseport/BWMON/run.sh

@@ -3,15 +3,41 @@
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
-# Import test suite definitions
-. "${PWD}"/init_env
-TESTNAME="BWMON"
+# Robustly find and source init_env
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+INIT_ENV=""
+SEARCH="$SCRIPT_DIR"
+while [ "$SEARCH" != "/" ]; do
+    if [ -f "$SEARCH/init_env" ]; then
+        INIT_ENV="$SEARCH/init_env"
+        break
+    fi
+    SEARCH=$(dirname "$SEARCH")
+done
+
+if [ -z "$INIT_ENV" ]; then
+    echo "[ERROR] Could not find init_env (starting at $SCRIPT_DIR)" >&2
+    exit 1
+fi
 
-#import test functions library
-. "${TOOLS}"/functestlib.sh
+# Only source if not already loaded (idempotent)
+if [ -z "$__INIT_ENV_LOADED" ]; then
+    # shellcheck disable=SC1090
+    . "$INIT_ENV"
+fi
+# Always source functestlib.sh, using $TOOLS exported by init_env
+# shellcheck disable=SC1090,SC1091
+. "$TOOLS/functestlib.sh"
+
+TESTNAME="BWMON"
 test_path=$(find_test_case_by_name "$TESTNAME")
-log_info "--------------------------------------------------------------------------"
+cd "$test_path" || exit 1
+# shellcheck disable=SC2034
+res_file="./$TESTNAME.res"
+
+log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
+log_info "=== Test Initialization ==="
 
 log_info "Checking if dependency binary is available"
 check_dependencies bw_mem
@@ -56,9 +82,9 @@ done
 
 if $incremented; then
     log_pass "$TESTNAME : Test Passed"
-    echo "$TESTNAME PASS" > $test_path/$TESTNAME.res
+    echo "$TESTNAME PASS" > "$res_file" 
 else
     log_fail "$TESTNAME : Test Failed"
-    echo "$TESTNAME FAIL" > $test_path/$TESTNAME.res
+    echo "$TESTNAME FAIL" > "$res_file"
 fi
 log_info "-------------------Completed $TESTNAME Testcase----------------------------"

Runner/suites/Kernel/FunctionalArea/baseport/Buses/run.sh

@@ -2,29 +2,53 @@
 
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
+# Robustly find and source init_env
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+INIT_ENV=""
+SEARCH="$SCRIPT_DIR"
+while [ "$SEARCH" != "/" ]; do
+    if [ -f "$SEARCH/init_env" ]; then
+        INIT_ENV="$SEARCH/init_env"
+        break
+    fi
+    SEARCH=$(dirname "$SEARCH")
+done
 
-# Import test suite definitions
-. "${PWD}"/init_env
-TESTNAME="Buses"
+if [ -z "$INIT_ENV" ]; then
+    echo "[ERROR] Could not find init_env (starting at $SCRIPT_DIR)" >&2
+    exit 1
+fi
+
+# Only source if not already loaded (idempotent)
+if [ -z "$__INIT_ENV_LOADED" ]; then
+    # shellcheck disable=SC1090
+    . "$INIT_ENV"
+fi
+# Always source functestlib.sh, using $TOOLS exported by init_env
+# shellcheck disable=SC1090,SC1091
+. "$TOOLS/functestlib.sh"
 
-#import test functions library
-. "${TOOLS}"/functestlib.sh
+TESTNAME="Buses"
 test_path=$(find_test_case_by_name "$TESTNAME")
+cd "$test_path" || exit 1
+# shellcheck disable=SC2034
+res_file="./$TESTNAME.res"
+
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
+log_info "=== Test Initialization ==="
 
 log_info "Checking if dependency binary is available"
 check_dependencies i2c-msm-test
 
 log_info "running i2c binary"
 output=$(i2c-msm-test -v -D /dev/i2c-0 -l | grep "ret:1")
 
-
 if echo "$output" | grep -q "Reading"; then
     log_pass "$TESTNAME : Test Passed"
-    echo "$TESTNAME PASS" > $test_path/$TESTNAME.res
+    echo "$TESTNAME PASS" > "$res_file"
 else
     log_fail "$TESTNAME : Test Failed"
-    echo "$TESTNAME FAIL" > $test_path/$TESTNAME.res
+    echo "$TESTNAME FAIL" > "$res_file" 
 fi
 log_info "-------------------Completed $TESTNAME Testcase----------------------------"

Runner/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/run.sh

@@ -3,54 +3,86 @@
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
-. "${PWD}/init_env"
-TESTNAME="CPUFreq_Validation"
+# Robustly find and source init_env
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+INIT_ENV=""
+SEARCH="$SCRIPT_DIR"
+while [ "$SEARCH" != "/" ]; do
+    if [ -f "$SEARCH/init_env" ]; then
+        INIT_ENV="$SEARCH/init_env"
+        break
+    fi
+    SEARCH=$(dirname "$SEARCH")
+done
+
+if [ -z "$INIT_ENV" ]; then
+    echo "[ERROR] Could not find init_env (starting at $SCRIPT_DIR)" >&2
+    exit 1
+fi
+
+# Only source if not already loaded (idempotent)
+if [ -z "$__INIT_ENV_LOADED" ]; then
+    # shellcheck disable=SC1090
+    . "$INIT_ENV"
+fi
+# Always source functestlib.sh, using $TOOLS exported by init_env
+# shellcheck disable=SC1090,SC1091
 . "$TOOLS/functestlib.sh"
 
+TESTNAME="CPUFreq_Validation"
 test_path=$(find_test_case_by_name "$TESTNAME")
+cd "$test_path" || exit 1
+# shellcheck disable=SC2034
+res_file="./$TESTNAME.res"
+
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
-log_info "=== CPUFreq Frequency Walker with Validation ==="
-
-# Color codes (ANSI escape sequences)
-GREEN="\033[32m"
-RED="\033[31m"
-YELLOW="\033[33m"
-BLUE="\033[34m"
-NC="\033[0m"
+log_info "=== CPUFreq Frequency Walker with Retry and Cleanup ==="
 
 NUM_CPUS=$(nproc)
-printf "${YELLOW}Detected %s CPU cores.${NC}\n" "$NUM_CPUS"
+log_info "Detected $NUM_CPUS CPU cores."
 
 overall_pass=0
 status_dir="/tmp/cpufreq_status.$$"
 mkdir -p "$status_dir"
 
 validate_cpu_core() {
-    local cpu=$1
-    local core_id=$2
-    status_file="$status_dir/core_$core_id"
+    local cpu="$1"
+    local core_id="$2"
+    local status_file="$status_dir/core_$core_id"
+    echo "unknown" > "$status_file"
 
-    printf "${BLUE}Processing %s...${NC}\n" "$cpu"
+    log_info "Processing $cpu..."
+
+    local cpu_num
+    cpu_num=$(basename "$cpu" | tr -dc '0-9')
+    if [ -f "/sys/devices/system/cpu/cpu$cpu_num/online" ]; then
+        echo 1 > "/sys/devices/system/cpu/cpu$cpu_num/online"
+    fi
 
     if [ ! -d "$cpu/cpufreq" ]; then
-        printf "${BLUE}[SKIP]${NC} %s does not support cpufreq.\n" "$cpu"
+        log_info "[SKIP] $cpu does not support cpufreq."
         echo "skip" > "$status_file"
         return
     fi
 
-    available_freqs=$(cat "$cpu/cpufreq/scaling_available_frequencies" 2>/dev/null)
-
+    local freqs_file="$cpu/cpufreq/scaling_available_frequencies"
+    read -r available_freqs < "$freqs_file" 2>/dev/null
     if [ -z "$available_freqs" ]; then
-        printf "${YELLOW}[INFO]${NC} No available frequencies for %s. Skipping...\n" "$cpu"
+        log_info "[SKIP] No available frequencies for $cpu"
         echo "skip" > "$status_file"
         return
     fi
 
-    if echo "userspace" | tee "$cpu/cpufreq/scaling_governor" > /dev/null; then
-        printf "${YELLOW}[INFO]${NC} Set governor to userspace.\n"
+    local original_governor
+    original_governor=$(cat "$cpu/cpufreq/scaling_governor" 2>/dev/null)
+
+    if echo "userspace" > "$cpu/cpufreq/scaling_governor"; then
+        log_info "[INFO] Set governor to userspace."
+        sync
+        sleep 0.5
     else
-        printf "${RED}[ERROR]${NC} Cannot set userspace governor for %s.\n" "$cpu"
+        log_error "Cannot set userspace governor for $cpu."
         echo "fail" > "$status_file"
         return
     fi
@@ -59,23 +91,46 @@ validate_cpu_core() {
 
     for freq in $available_freqs; do
         log_info "Setting $cpu to frequency $freq kHz..."
-        if echo "$freq" | tee "$cpu/cpufreq/scaling_setspeed" > /dev/null; then
+
+        echo "$freq" > "$cpu/cpufreq/scaling_min_freq" 2>/dev/null
+        echo "$freq" > "$cpu/cpufreq/scaling_max_freq" 2>/dev/null
+
+        if ! echo "$freq" > "$cpu/cpufreq/scaling_setspeed" 2>/dev/null; then
+            log_error "[SKIP] Kernel rejected freq $freq for $cpu"
+            continue
+        fi
+
+        retry=0
+        success=0
+        while [ "$retry" -lt 5 ]; do
+            cur=$(cat "$cpu/cpufreq/scaling_cur_freq")
+            if [ "$cur" = "$freq" ]; then
+                log_info "[PASS] $cpu set to $freq kHz."
+                success=1
+                break
+            fi
             sleep 0.2
-            actual_freq=$(cat "$cpu/cpufreq/scaling_cur_freq")
-            if [ "$actual_freq" = "$freq" ]; then
-                printf "${GREEN}[PASS]${NC} %s set to %s kHz.\n" "$cpu" "$freq"
+            retry=$((retry + 1))
+        done
+
+        if [ "$success" -eq 0 ]; then
+            log_info "[RETRY] Re-attempting to set $cpu to $freq kHz..."
+            echo "$freq" > "$cpu/cpufreq/scaling_setspeed"
+            sleep 0.3
+            cur=$(cat "$cpu/cpufreq/scaling_cur_freq")
+            if [ "$cur" = "$freq" ]; then
+                log_info "[PASS-after-retry] $cpu set to $freq kHz."
             else
-                printf "${RED}[FAIL]${NC} Tried to set %s to %s kHz, but current is %s kHz.\n" "$cpu" "$freq" "$actual_freq"
+                log_error "[FAIL] $cpu failed to set $freq kHz twice. Current: $cur"
                 echo "fail" > "$status_file"
             fi
-        else
-            printf "${RED}[ERROR]${NC} Failed to set %s to %s kHz.\n" "$cpu" "$freq"
-            echo "fail" > "$status_file"
         fi
     done
 
-    echo "Restoring $cpu governor to 'ondemand'..."
-    echo "ondemand" | sudo tee "$cpu/cpufreq/scaling_governor" > /dev/null
+    log_info "Restoring $cpu governor to '$original_governor'..."
+    echo "$original_governor" > "$cpu/cpufreq/scaling_governor"
+    echo 0 > "$cpu/cpufreq/scaling_min_freq" 2>/dev/null
+    echo 0 > "$cpu/cpufreq/scaling_max_freq" 2>/dev/null
 }
 
 cpu_index=0
@@ -93,36 +148,34 @@ for status_file in "$status_dir"/core_*; do
     status=$(cat "$status_file")
     case "$status" in
         pass)
-            printf "CPU%s: ${GREEN}[PASS]${NC}\n" "$idx"
+            log_info "CPU$idx: [PASS]"
             ;;
         fail)
-            printf "CPU%s: ${RED}[FAIL]${NC}\n" "$idx"
+            log_error "CPU$idx: [FAIL]"
             overall_pass=1
             ;;
         skip)
-            printf "CPU%s: ${BLUE}[SKIPPED]${NC}\n" "$idx"
+            log_info "CPU$idx: [SKIPPED]"
             ;;
         *)
-            printf "CPU%s: ${RED}[UNKNOWN STATUS]${NC}\n" "$idx"
+            log_error "CPU$idx: [UNKNOWN STATUS]"
             overall_pass=1
             ;;
     esac
 done
 
 log_info ""
 log_info "=== Overall CPUFreq Validation Result ==="
+
 if [ "$overall_pass" -eq 0 ]; then
-    printf "${GREEN}[OVERALL PASS]${NC} All CPUs validated successfully.\n"
     log_pass "$TESTNAME : Test Passed"
-    echo "$TESTNAME PASS" > "$test_path/$TESTNAME.res"
-    rm -r "$status_dir"
-    exit 0
+    echo "$TESTNAME PASS" > "$res_file"
 else
-    printf "${RED}[OVERALL FAIL]${NC} Some CPUs failed frequency validation.\n"
     log_fail "$TESTNAME : Test Failed"
-    echo "$TESTNAME FAIL" > "$test_path/$TESTNAME.res"
-    rm -r "$status_dir"
-    exit 1
+    echo "$TESTNAME FAIL" > "$res_file"
 fi
 
-log_info "-------------------Completed $TESTNAME Testcase----------------------------"
+rm -r "$status_dir"
+sync
+sleep 1
+exit "$overall_pass"