From 2c4866228e83e3dc4ae547356fe4be4ce4fda77b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 29 May 2020 13:52:12 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41858 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- util/board_status/board_status.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'util/board_status') diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index 2e93fe22fe..dd3d8f2c5e 100755 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -422,12 +422,6 @@ else echo "Getting coreboot boot log" 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" 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" 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. # -- cgit v1.2.3