Skip to content

Restore qemu error messages #3101

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

Merged
lgirdwood merged 2 commits into from
Jun 30, 2020
Merged

Restore qemu error messages #3101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fcd238
qemu-check.sh: make $ROM a quoted bash array "${ROM[@]}"
marc-hb Jun 27, 2020
aaea5a7
qemu-check.sh: restore error messages when test fails
marc-hb Jun 27, 2020
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
14 changes: 9 additions & 5 deletions scripts/qemu-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ rm -f dump-*.txt
die()
{
>&2 printf '%s ERROR: ' "$0"
# We want die() to be usable exactly like printf
# shellcheck disable=SC2059
>&2 printf "$@"
exit 1
}
Expand Down Expand Up @@ -145,25 +147,27 @@ do
esac

if $has_rom; then
ROM="-r ${SOF_BUILDS}/build_${platform}_gcc"
ROM+="/src/arch/xtensa/rom-$platform.bin"
ROM=(-r "${SOF_BUILDS}/build_${platform}_gcc/src/arch/xtensa/rom-$platform.bin")
fi

xtensa_host_sh=$(find_qemu_xtensa)

${xtensa_host_sh} "$PLATFORM" -k \
"${SOF_BUILDS}"/build_"${platform}"_gcc/src/arch/xtensa/"$FWNAME" \
$ROM \
"${ROM[@]}" \
-o 2.0 "${SOF_BUILDS}"/dump-"$platform".txt || true # timeout
# dump log into sof.git incase running in docker

# use regular expression to match the SHM IPC REG file name
SHM_IPC_REG_FILE=$(ls /dev/shm/ | grep -E $SHM_IPC_REG)

# check if ready ipc header is in the ipc regs
IPC_REG=$(hexdump -C /dev/shm/"$SHM_IPC_REG_FILE" | grep "$READY_IPC")
IPC_REG=$(hexdump -C /dev/shm/"$SHM_IPC_REG_FILE" |
grep "$READY_IPC") || true

# check if ready ipc message is in the mbox
IPC_MSG=$(hexdump -C /dev/shm/$SHM_MBOX | grep -A 4 "$READY_MSG" | grep -A 4 "$OUTBOX_OFFSET")
IPC_MSG=$(hexdump -C /dev/shm/$SHM_MBOX | grep -A 4 "$READY_MSG" |
grep -A 4 "$OUTBOX_OFFSET") || true

if [ "$IPC_REG" ]; then
echo "ipc reg dump:"
Expand Down