util/board_status: Also check remotely retrieved coreboot console log

Currently, the logs are only checked, if retrieved locally. Moving it
after the if statement, now logs retrieved remotely are also checked.

The change in behavior is, that now all commands are executed first, so
before hitting this error, other errors might occur unrelated to the
console log.

Change-Id: I016bbde66c58a654042ad880c6007ddc1d143691
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41858
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Paul Menzel 2020-05-29 13:52:12 +02:00 committed by Patrick Georgi
parent 5b185840f7
commit 2c4866228e
1 changed files with 10 additions and 6 deletions

View File

@ -422,12 +422,6 @@ else
echo "Getting coreboot boot log" echo "Getting coreboot boot log"
cmd $LOCAL "$cbmem_cmd -1" "${tmpdir}/${results}/coreboot_console.txt" cmd $LOCAL "$cbmem_cmd -1" "${tmpdir}/${results}/coreboot_console.txt"
if [ $(grep -- -dirty "${tmpdir}/${results}/coreboot_console.txt") ]; then
echo "coreboot or the payload are built from a source tree in a" \
"dirty state, making it hard to reproduce the result. Please" \
"check in your source tree with 'git status'."
exit $EXIT_FAILURE
fi
echo "Getting timestamp data" echo "Getting timestamp data"
cmd_nonfatal $LOCAL "$cbmem_cmd -t" "${tmpdir}/${results}/coreboot_timestamps.txt" cmd_nonfatal $LOCAL "$cbmem_cmd -t" "${tmpdir}/${results}/coreboot_timestamps.txt"
@ -455,6 +449,16 @@ else
cmd $LOCAL "sudo dmesg" "${tmpdir}/${results}/kernel_log.txt" cmd $LOCAL "sudo dmesg" "${tmpdir}/${results}/kernel_log.txt"
fi fi
#
# Check files
#
if [ $(grep -- -dirty "${tmpdir}/${results}/coreboot_console.txt") ]; then
echo "coreboot or the payload are built from a source tree in a" \
"dirty state, making it hard to reproduce the result. Please" \
"check in your source tree with 'git status'."
exit $EXIT_FAILURE
fi
# #
# Finish up. # Finish up.
# #