summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Menzel <pmenzel@molgen.mpg.de>2020-05-29 13:52:12 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-06-14 16:44:05 +0000
commit2c4866228e83e3dc4ae547356fe4be4ce4fda77b (patch)
treec19da09f082ddd09d1a221dd4362f1ce61117c96
parent5b185840f78064b9b71a30c2bb0eb3a2c57e44cd (diff)
downloadcoreboot-2c4866228e83e3dc4ae547356fe4be4ce4fda77b.tar.xz
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>
-rwxr-xr-xutil/board_status/board_status.sh16
1 files changed, 10 insertions, 6 deletions
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"
@@ -456,6 +450,16 @@ else
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.
#
coreboot_dir=$(pwd)