Merge branch 'qualcomm-linux:main' into main

Author: smuppand

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

@@ -9,6 +9,9 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "--------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
+log_info "Checking if dependency binary is available"
+check_dependencies bw_mem
+
 log_info "Fetching te interconnect summary"
 extract_votes() {
   cat /sys/kernel/debug/interconnect/interconnect_summary | grep -i pmu | awk '{print $NF}'
@@ -21,7 +24,7 @@ log_info "$initial_votes"
 log_info "$initial_votes"
 
 log_info "Running bw_mem tool..." 
-/var/common/bins/bw_mem 4000000000 frd &
+bw_mem 4000000000 frd &
 
 sleep 2
 

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

@@ -9,8 +9,11 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
+log_info "Checking if dependency binary is available"
+check_dependencies i2c-msm-test
+
 log_info "running i2c binary"
-output=$(/var/common/bins/buses/i2c-msm-test -v -D /dev/i2c-0 -l | grep "ret:1")
+output=$(i2c-msm-test -v -D /dev/i2c-0 -l | grep "ret:1")
 
 
 if echo "$output" | grep -q "Reading"; then

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

@@ -9,6 +9,8 @@ test_bin_path=$(find_test_case_bin_by_name "lat_mem_rd")
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
+log_info "Checking if dependency binary is available"
+check_dependencies lat_mem_rd
 
 extract_votes() {
   cat /sys/kernel/debug/interconnect/interconnect_summary | grep -i cpu | awk '{print $NF}'

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

@@ -9,11 +9,10 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
-cp -r /kcapi/kcapi-convience /usr/bin/
+log_info "Checking if dependency binary is available"
+check_dependencies kcapi-convience
 
-chmod 777 /usr/bin/kcapi-convience
-
-/usr/bin/kcapi-convience
+kcapi-convience
 
 echo $?
 

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

@@ -9,16 +9,16 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
-chmod -R 777 /rngtest
-
-cd /rngtest
+log_info "Checking if dependency binary is available"
+check_dependencies rngtest
 
 cat /dev/random | rngtest -c 1000 > /tmp/rngtest_output.txt
 
 grep 'count of bits' /tmp/rngtest_output.txt | awk '{print $NF}' > /tmp/rngtest_value.txt
 
 value=$(cat /tmp/rngtest_value.txt)
 
+
 if [ "$value" -lt 10 ]; then
     log_pass "$TESTNAME : Test Passed"
     echo "$TESTNAME : Test Passed" > $test_path/$TESTNAME.res

Runner/suites/Multimedia/DSP_AudioPD/run.sh

@@ -9,13 +9,10 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "--------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
-# Make the test executable
-chmod -R 777 /DSP_audioPD
+log_info "Checking if dependency binary is available"
+check_dependencies adsprpcd
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/DSP_audioPD/libs/
-
-cd /DSP_audioPD/bins/
-./adsprpcd &
+adsprpcd &
 PID = $!
 
 if [ -z "$PID" ]; then

Runner/suites/Multimedia/Graphics/run.sh

@@ -9,11 +9,8 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
-cd /Graphics
-
-cp -r a660_sqe.fw /lib/firmware/
-cp -r a660_zap.mbn /lib/firmware/qcom/qcs6490/
-cp -r a660_gmu.bin /lib/firmware/
+log_info "Checking if dependency binary is available"
+check_dependencies a660_sqe.fw a660_zap.mbn a660_gmu.bin
 
 # Clear dmesg logs
 dmesg -c

Runner/suites/Multimedia/Video/iris_v4l2_video_decode/run.sh

@@ -9,11 +9,11 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
-# Make the test executable
-chmod -R 777 /Video
+log_info "Checking if dependency binary is available"
+check_dependencies iris_v4l2_test
 
 # Run the first test
-/Video/iris_v4l2_test --config /Video/DEC_AVC_NV12_BASIC_CFG.json --loglevel 15 >> video_dec.txt
+iris_v4l2_test --config /Video/DEC_AVC_NV12_BASIC_CFG.json --loglevel 15 >> video_dec.txt
 
 if grep -q "Test Passed" "video_dec.txt"; then
     log_pass "$TESTNAME : Test Passed"

Runner/suites/Multimedia/Video/iris_v4l2_video_encode/run.sh

@@ -9,11 +9,11 @@ test_path=$(find_test_case_by_name "$TESTNAME")
 log_info "-----------------------------------------------------------------------------------------"
 log_info "-------------------Starting $TESTNAME Testcase----------------------------"
 
-# Make the test executable
-chmod -R 777 /Video
+log_info "Checking if dependency binary is available"
+check_dependencies iris_v4l2_test
 
 # Run the first test
-/Video/iris_v4l2_test --config /Video/ENC_AVC_NV12_BASIC_CFG.json --loglevel 15 >> video_enc.txt
+iris_v4l2_test --config /Video/ENC_AVC_NV12_BASIC_CFG.json --loglevel 15 >> video_enc.txt
 
 if grep -q "Test Passed" "video_enc.txt"; then
     log_pass "$TESTNAME : Test Passed"

Runner/utils/functestlib.sh

@@ -32,6 +32,21 @@ find_test_case_script_by_name() {
     find $__RUNNER_UTILS_BIN_DIR -type d -iname "$test_name" 2>/dev/null
 }
 
+check_dependencies() {
+    local missing=0
+    for cmd in "$@"; do
+        if ! command -v "$cmd" &>/dev/null; then
+            log_error "ERROR: Required command '$cmd' not found in PATH."
+            missing=1
+        fi
+    done
+    if [ "$missing" -ne 0 ]; then
+        log_error "Exiting due to missing dependencies."
+        exit 1
+    else
+	log_pass "Test related dependencies are present."
+    fi
+}
 
 # Logging levels
 log_info() { log "INFO" "$@"; }