Skip to content

Commit 4695a9e

Browse files
committed
IRIS: add default app/firmware fallbacks for test runner
- Prefer user-specified --app; otherwise search PATH, then /usr/bin/iris_v4l2_test, then /data/vendor/iris_test_app/iris_v4l2_test. - For Kodiak downstream, if --downstream-fw is not given, auto-use /data/vendor/iris_test_app/firmware/vpu20_1v.mbn when present. - Keep existing names/logic; only path resolution and default selection updated. - Log which app/firmware paths are chosen to aid debugging. - No changes to test flow, results, or stack-switch behavior. Signed-off-by: Srikanth Muppandam <[email protected]>
1 parent 115d9af commit 4695a9e

File tree

1 file changed

+20
-4
lines changed
  • Runner/suites/Multimedia/Video/Video_V4L2_Runner

1 file changed

+20
-4
lines changed

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,31 @@ if [ -n "$VIDEO_APP" ] && [ -f "$VIDEO_APP" ] && [ ! -x "$VIDEO_APP" ]; then
241241
fi
242242
fi
243243

244-
# Decide final app path: if --app given, require it; otherwise try default path, else PATH
244+
# ---- Default firmware path for Kodiak downstream if CLI not given ----
245+
if [ -z "${VIDEO_FW_DS:-}" ]; then
246+
default_fw="/data/vendor/iris_test_app/firmware/vpu20_1v.mbn"
247+
if [ -f "$default_fw" ]; then
248+
VIDEO_FW_DS="$default_fw"
249+
export VIDEO_FW_DS
250+
log_info "Using default downstream firmware path: $VIDEO_FW_DS"
251+
fi
252+
fi
253+
254+
# Decide final app path: if --app given, require it; otherwise search PATH, /usr/bin, /data/vendor/iris_test_app
245255
final_app=""
246256

247257
if [ -n "$VIDEO_APP" ] && [ -x "$VIDEO_APP" ]; then
248258
final_app="$VIDEO_APP"
249259
else
250-
if [ "$VIDEO_APP" = "/usr/bin/iris_v4l2_test" ]; then
251-
if command -v iris_v4l2_test >/dev/null 2>&1; then
252-
final_app="$(command -v iris_v4l2_test)"
260+
if command -v iris_v4l2_test >/dev/null 2>&1; then
261+
final_app="$(command -v iris_v4l2_test)"
262+
else
263+
if [ -x "/usr/bin/iris_v4l2_test" ]; then
264+
final_app="/usr/bin/iris_v4l2_test"
265+
else
266+
if [ -x "/data/vendor/iris_test_app/iris_v4l2_test" ]; then
267+
final_app="/data/vendor/iris_test_app/iris_v4l2_test"
268+
fi
253269
fi
254270
fi
255271
fi

0 commit comments

Comments
 (0)