Skip to content

Fastrpc Test: Eliminate architecture dependency and execute on defaul… #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fastrpc Test: Eliminate architecture dependency and execute on defaul… #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions Runner/suites/Multimedia/CDSP/fastrpc_test/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ RESULT_FILE="$TESTNAME.res"
# Defaults
REPEAT=1
TIMEOUT=""
ARCH=""
BIN_DIR="" # optional: where fastrpc_test lives
ASSETS_DIR="" # optional: parent containing linux/ etc
VERBOSE=0
Expand All @@ -43,7 +42,6 @@ usage() {
Usage: $0 [OPTIONS]

Options:
--arch <name> Architecture (auto-detected if omitted)
--bin-dir <path> Directory containing 'fastrpc_test' binary
--assets-dir <path> Directory that CONTAINS 'linux/' (run from here if present)
--repeat <N> Number of test repetitions (default: 1)
Expand All @@ -61,7 +59,6 @@ EOF
# Parse arguments
while [ $# -gt 0 ]; do
case "$1" in
--arch) ARCH="$2"; shift 2 ;;
--bin-dir) BIN_DIR="$2"; shift 2 ;;
--assets-dir) ASSETS_DIR="$2"; shift 2 ;;
--repeat) REPEAT="$2"; shift 2 ;;
Expand Down Expand Up @@ -105,17 +102,6 @@ fi
BINDIR="$(dirname "$FASTBIN")"
log_info "Binary: $FASTBIN"

# ---------- Arch detection if needed ----------
if [ -z "$ARCH" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific reason for removing the arch support? Is it not required to run the fastrpc_test?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it's not needed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it's not needed

Instead of removing it, simply avoid calling --arch in your .yaml file. It defaults to v68 anyway.

soc="$(cat /sys/devices/soc0/soc_id 2>/dev/null || echo "unknown")"
case "$soc" in
498) ARCH="v68" ;;
676|534) ARCH="v73" ;;
606) ARCH="v75" ;;
*) log_warn "Unknown SoC ID: $soc; defaulting to 'v68'"; ARCH="v68" ;;
esac
fi

# ---------- Buffering tool availability ----------
HAVE_STDBUF=0; command -v stdbuf >/dev/null 2>&1 && HAVE_STDBUF=1
HAVE_SCRIPT=0; command -v script >/dev/null 2>&1 && HAVE_SCRIPT=1
Expand Down Expand Up @@ -198,7 +184,7 @@ LOG_ROOT="./logs_${TESTNAME}_${TS}"
mkdir -p "$LOG_ROOT" || { log_error "Cannot create $LOG_ROOT"; echo "$TESTNAME : FAIL" >"$RESULT_FILE"; exit 1; }

tmo_label="none"; [ -n "$TIMEOUT" ] && tmo_label="${TIMEOUT}s"
log_info "Arch: $ARCH | Repeats: $REPEAT | Timeout: $tmo_label | Buffering: $buf_label"
log_info "Repeats: $REPEAT | Timeout: $tmo_label | Buffering: $buf_label"
log_debug "Run dir: $RESOLVED_RUN_DIR | PATH=$PATH"

# ---------- Run loop ----------
Expand All @@ -216,23 +202,23 @@ while [ "$i" -le "$REPEAT" ]; do
if [ $HAVE_STDBUF -eq 1 ]; then
(
cd "$RESOLVED_RUN_DIR" || exit 127
run_with_timeout "$TIMEOUT" -- stdbuf -oL -eL "$FASTBIN" -d 3 -U 1 -t linux -a "$ARCH"
run_with_timeout "$TIMEOUT" -- stdbuf -oL -eL "$FASTBIN" -d 3 -U 1 -t linux
) >"$iter_log" 2>&1
rc=$?
elif [ $HAVE_SCRIPT -eq 1 ]; then
(
cd "$RESOLVED_RUN_DIR" || exit 127
if [ -n "$TIMEOUT" ] && [ $HAVE_TIMEOUT -eq 1 ]; then
script -q -c "timeout $TIMEOUT \"$FASTBIN\" -d 3 -U 1 -t linux -a \"$ARCH\"" /dev/null
script -q -c "timeout $TIMEOUT \"$FASTBIN\" -d 3 -U 1 -t linux " /dev/null
else
script -q -c "\"$FASTBIN\" -d 3 -U 1 -t linux -a \"$ARCH\"" /dev/null
script -q -c "\"$FASTBIN\" -d 3 -U 1 -t linux " /dev/null
fi
) >"$iter_log" 2>&1
rc=$?
else
(
cd "$RESOLVED_RUN_DIR" || exit 127
run_with_timeout "$TIMEOUT" -- "$FASTBIN" -d 3 -U 1 -t linux -a "$ARCH"
run_with_timeout "$TIMEOUT" -- "$FASTBIN" -d 3 -U 1 -t linux
) >"$iter_log" 2>&1
rc=$?
fi
Expand Down
Loading