graphics: kmscube — fix binary check, robust frame parsing, and Weston handling

- Use 'check_dependencies kmscube' (not 'KMSCube') to avoid false SKIPs.
- Run from the testcase dir; write ./KMSCube.res next to run.sh.
- If Weston is running, stop it; run kmscube headless on DRM; relaunch Weston.
- Parse 'Rendered N frames' and accept N or N-1 for leniency.
- Support FRAME_COUNT override; log to KMSCube_run.log.
- CI-friendly PASS/FAIL/SKIP and clearer logs.

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

Author: smuppand

Runner/suites/Multimedia/Graphics/KMSCube/run.sh

@@ -2,7 +2,9 @@
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
-# KMSCube Validator Script (Yocto-Compatible)
+# KMSCube Validator Script (Yocto-Compatible, POSIX sh)
+
+# --- Robustly find and source init_env ---------------------------------------
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 INIT_ENV=""
 SEARCH="$SCRIPT_DIR"
@@ -19,56 +21,101 @@ if [ -z "$INIT_ENV" ]; then
     exit 1
 fi
 
+# Only source once (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"
 
+# --- Test metadata -----------------------------------------------------------
 TESTNAME="KMSCube"
-FRAME_COUNT=999
-EXPECTED_FRAMES=$((FRAME_COUNT - 1))
-test_path=$(find_test_case_by_name "$TESTNAME")
+FRAME_COUNT="${FRAME_COUNT:-999}" # allow override via env
+EXPECTED_MIN=$((FRAME_COUNT - 1)) # tolerate off-by-one under-reporting
+
+# Ensure we run from the testcase directory so .res/logs land next to run.sh
+test_path="$(find_test_case_by_name "$TESTNAME")"
 cd "$test_path" || exit 1
+
 RES_FILE="./$TESTNAME.res"
 LOG_FILE="./${TESTNAME}_run.log"
 rm -f "$RES_FILE" "$LOG_FILE"
 
 log_info "-------------------------------------------------------------------"
 log_info "------------------- Starting $TESTNAME Testcase -------------------"
 
-if check_dependencies "$TESTNAME"; then
-    log_fail "$TESTNAME : kmscube binary not found"
-    echo "$TESTNAME SKIP" > "$RES_FILE"
-    exit 1
+# --- Dependencies ------------------------------------------------------------
+# Note: check_dependencies returns 0 when present, non-zero if missing.
+check_dependencies kmscube || {
+    log_skip "$TESTNAME SKIP: missing dependencies: kmscube"
+    echo "$TESTNAME SKIP" >"$RES_FILE"
+    exit 0
+}
+KMSCUBE_BIN="$(command -v kmscube 2>/dev/null || true)"
+log_info "Using kmscube: ${KMSCUBE_BIN:-<not found>}"
+
+# --- Basic DRM availability guard -------------------------------------------
+set -- /dev/dri/card* 2>/dev/null
+if [ ! -e "$1" ]; then
+    log_skip "$TESTNAME SKIP: no /dev/dri/card* nodes"
+    echo "$TESTNAME SKIP" >"$RES_FILE"
+    exit 0
 fi
 
+# --- If Weston is running, stop it so KMS has control ------------------------
 weston_was_running=0
 if weston_is_running; then
     weston_stop
     weston_was_running=1
 fi
 
-log_info "Running kmscube test with --count=$FRAME_COUNT..."
-if kmscube --count="$FRAME_COUNT" > "$LOG_FILE" 2>&1; then
-    if grep -q "Rendered $EXPECTED_FRAMES frames" "$LOG_FILE"; then
-        log_pass "$TESTNAME : Test Passed"
-        echo "$TESTNAME PASS" > "$RES_FILE"
-    else
-        log_fail "$TESTNAME : Expected output not found (Rendered $EXPECTED_FRAMES frames)"
-        echo "$TESTNAME FAIL" > "$RES_FILE"
-        exit 1
+# --- Execute kmscube ---------------------------------------------------------
+log_info "Running kmscube with --count=${FRAME_COUNT} ..."
+if kmscube --count="${FRAME_COUNT}" >"$LOG_FILE" 2>&1; then :; else
+    rc=$?
+    log_fail "$TESTNAME : Execution failed (rc=$rc) — see $LOG_FILE"
+    echo "$TESTNAME FAIL" >"$RES_FILE"
+    if [ "$weston_was_running" -eq 1 ]; then
+        log_info "Restarting Weston after failure"
+        weston_start
     fi
+    exit 1
+fi
+
+# --- Parse 'Rendered N frames' (case-insensitive), use the last N -----------
+FRAMES_RENDERED="$(
+    awk 'BEGIN{IGNORECASE=1}
+         /Rendered[[:space:]][0-9]+[[:space:]]+frames/{
+             # capture the numeric token on that line; remember the last match
+             for(i=1;i<=NF;i++) if ($i ~ /^[0-9]+$/) n=$i
+             last=n
+         }
+         END{if (last!="") print last}' "$LOG_FILE"
+)"
+[ -n "$FRAMES_RENDERED" ] || FRAMES_RENDERED=0
+[ "$EXPECTED_MIN" -lt 0 ] && EXPECTED_MIN=0
+log_info "kmscube reported: Rendered ${FRAMES_RENDERED} frames (requested ${FRAME_COUNT}, min acceptable ${EXPECTED_MIN})"
+
+# --- Verdict -----------------------------------------------------------------
+if [ "$FRAMES_RENDERED" -ge "$EXPECTED_MIN" ]; then
+    log_pass "$TESTNAME : PASS"
+    echo "$TESTNAME PASS" >"$RES_FILE"
 else
-    log_fail "$TESTNAME : Execution failed (non-zero exit code)"
-    echo "$TESTNAME FAIL" > "$RES_FILE"
+    log_fail "$TESTNAME : FAIL (rendered ${FRAMES_RENDERED} < ${EXPECTED_MIN})"
+    echo "$TESTNAME FAIL" >"$RES_FILE"
+    if [ "$weston_was_running" -eq 1 ]; then
+        log_info "Restarting Weston after failure"
+        weston_start
+    fi
     exit 1
 fi
 
+# --- Restore Weston if we stopped it -----------------------------------------
 if [ "$weston_was_running" -eq 1 ]; then
-	log_info "weston realuching after $TESTNAME completion"
+    log_info "Restarting Weston after $TESTNAME completion"
     weston_start
 fi