Skip to content

Commit f4a7965

Browse files
authored
Merge pull request qualcomm-linux#169 from smuppand/fastrpc-test
fastrpc_test: default to /usr/local/bin and set LD_LIBRARY_PATH for local libs
2 parents c7f1e4f + 2227f64 commit f4a7965

File tree

1 file changed

+9
-4
lines changed
  • Runner/suites/Multimedia/CDSP/fastrpc_test

1 file changed

+9
-4
lines changed

Runner/suites/Multimedia/CDSP/fastrpc_test/run.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Usage: $0 [OPTIONS]
4848
4949
Options:
5050
--arch <name> Architecture (only if explicitly provided)
51-
--bin-dir <path> Directory containing 'fastrpc_test' (default: /usr/bin)
51+
--bin-dir <path> Directory containing 'fastrpc_test' (default: /usr/local/bin)
5252
--assets-dir <path> Directory that CONTAINS 'linux/' (info only)
5353
--domain <0|1|2|3> DSP domain: 0=ADSP, 1=MDSP, 2=SDSP, 3=CDSP
5454
--domain-name <name> DSP domain by name: adsp|mdsp|sdsp|cdsp
@@ -67,7 +67,7 @@ Env:
6767
6868
Notes:
6969
- Script *cd*s into the binary's directory and launches ./fastrpc_test so
70-
'linux/' next to the binary (e.g. /usr/bin/linux) is discovered reliably.
70+
'linux/' next to the binary (e.g. /usr/local/bin/linux) is discovered reliably.
7171
- If domain not provided, we auto-pick: CDSP if present; else ADSP; else SDSP; else 3.
7272
EOF
7373
}
@@ -192,13 +192,13 @@ log_soc_info
192192
if [ -n "$BIN_DIR" ]; then
193193
:
194194
else
195-
BIN_DIR="/usr/bin"
195+
BIN_DIR="/usr/local/bin"
196196
fi
197197

198198
case "$BIN_DIR" in
199199
/bin)
200200
if [ "${ALLOW_BIN_FASTRPC:-0}" -ne 1 ]; then
201-
log_fail "Refusing /bin by default (set ALLOW_BIN_FASTRPC=1 or use --bin-dir /usr/bin)"
201+
log_fail "Refusing /bin by default (set ALLOW_BIN_FASTRPC=1 or use --bin-dir /usr/local/bin)"
202202
echo "$TESTNAME : FAIL" >"$RESULT_FILE"
203203
exit 1
204204
fi
@@ -225,6 +225,11 @@ log_info "Binary details:"
225225
log_info " ls -l: $(ls -l "$RUN_BIN" 2>/dev/null || echo 'N/A')"
226226
log_info " file : $(file "$RUN_BIN" 2>/dev/null || echo 'N/A')"
227227

228+
# >>>>>>>>>>>>>>>>>>>>>> Added per your request <<<<<<<<<<<<<<<<<<<<<<
229+
export LD_LIBRARY_PATH="/usr/local/lib/fastrpc_test${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
230+
log_info "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
231+
# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
232+
228233
# Log *dsp remoteproc statuses via existing helpers
229234
log_dsp_remoteproc_status
230235

0 commit comments

Comments
 (0)