From 7a98591a1dcdeda9c67efc1e65c8549b528a1dd2 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 22 Jul 2018 10:31:19 -0600 Subject: abuild: Update failed boards handling - Use TARGET variable for location of passing/failing boards files. This should better handle the directory, wherever it is. - Don't save make.log location if make.log is being deleted. Change-Id: I28e55feef85c9b642ac5ff70ecef113cf7978707 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/27596 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- util/abuild/abuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 5ec416a97b..f67117c50c 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -379,7 +379,11 @@ function compile_target printf "failed\n" > compile.status printf "%s build FAILED after %ss!\nLog excerpt:\n" "$BUILD_NAME" "${duration}" tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log - echo "$BUILD_NAME - Log: ${TOP}/${build_dir}/make.log" >> "$FAILED_BOARDS" + if [ "$clean_work" = "true" ]; then + echo "$BUILD_NAME" >> "$FAILED_BOARDS" + else + echo "$BUILD_NAME - Log: ${build_dir}/make.log" >> "$FAILED_BOARDS" + fi failed=1 fi cd "$CURR" || return $? @@ -740,8 +744,8 @@ if [ "$customizing" = "" ]; then customizing="default configuration" fi -FAILED_BOARDS="${COREBOOT_BUILD_DIR:-${TOP}/coreboot-builds}/failed_boards" -PASSED_BOARDS="${COREBOOT_BUILD_DIR:-${TOP}/coreboot-builds}/passing_boards" +FAILED_BOARDS="${TARGET}/failed_boards" +PASSED_BOARDS="${TARGET}/passing_boards" if [ "$recursive" = "false" ]; then rm -f "$FAILED_BOARDS" "$PASSED_BOARDS" -- cgit v1.2.3