Skip to content

Commit fdc9c86

Browse files
authored
Merge pull request #355 from smuppand/Display
shellcheck: drop shadowed duplicate helpers in lib_display and lib_video
2 parents 718ae18 + cc047db commit fdc9c86

3 files changed

Lines changed: 9 additions & 22 deletions

File tree

Runner/utils/lib_display.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,17 +1070,6 @@ egli_pick_platform_flag() {
10701070
return 0
10711071
}
10721072

1073-
egli_glvnd_icd_from_json() {
1074-
# Extract ICD library_path from a GLVND EGL vendor JSON (no jq).
1075-
# Prints the value (e.g., libEGL_adreno.so.1) or empty on failure.
1076-
f="$1"
1077-
[ -r "$f" ] || { printf '%s\n' ""; return 0; }
1078-
1079-
# Match a line containing "library_path" : "...."
1080-
# Keep it resilient to whitespace.
1081-
sed -n 's/.*"library_path"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$f" | head -n 1
1082-
}
1083-
10841073
egli_glvnd_icd_from_json() {
10851074
# Extract ICD library_path from a GLVND EGL vendor JSON (no jq).
10861075
# Prints the value (e.g., libEGL_adreno.so.1) or empty on failure.

Runner/utils/lib_video.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1606,10 +1606,6 @@ video_run_once() {
16061606
# -----------------------------------------------------------------------------
16071607
# Kodiak firmware swap + live reload (no reboot)
16081608
# -----------------------------------------------------------------------------
1609-
video_kodiak_fw_basename() {
1610-
printf '%s\n' "vpu20_p1_gen2.mbn"
1611-
}
1612-
16131609
video_kodiak_install_fw() {
16141610
# usage: video_kodiak_install_fw /path/to/vpuw20_1v.mbn
16151611
src="$1"

Runner/utils/result_parse.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
#!/bin/sh
2-
32
# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
4-
# SPDX-License-Identifier: BSD-3-Clauseecho "Current working directory is $PWD"
3+
# SPDX-License-Identifier: BSD-3-Clause
4+
echo "Current working directory is $PWD"
55

6-
find . -type f -name "*.res" 2>/dev/null | while IFS= read res_file; do
6+
find . -type f -name "*.res" 2>/dev/null | while IFS= read -r res_file; do
77
echo "$res_file"
88
if [ -f "$res_file" ]; then
9-
while IFS= read line; do
9+
while IFS= read -r line; do
1010
# Skip empty lines
1111
[ -z "$line" ] && continue
12-
13-
# Split line into words
12+
13+
# Split line into whitespace-separated fields
14+
# shellcheck disable=SC2086
1415
set -- $line
1516
tc_name=$1
1617
result=$2
18+
1719
# Report each test case result to LAVA
1820
if [ -n "$tc_name" ] && [ -n "$result" ]; then
19-
if [ "$result" = "FAIL" ]; then
21+
if [ "$result" = "FAIL" ]; then
2022
exit 1
2123
fi
2224
else

0 commit comments

Comments
 (0)