From b94fb0217809853fb4bf97ea55653588a3361d59 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 3 Aug 2023 14:44:10 -0600 Subject: [PATCH] util/abuild: Better identify config string in log When using the --skip_set and --skip_unset arguments, the config line looked like a statement that the build was being skipped instead of abuild just printing the configuration. This updates those config statements to better show that it's the config and not stating that this particular build is being skipped. Signed-off-by: Martin Roth Change-Id: I6cc59f9b33dcda51aeb3640d449037a0aa054e36 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76936 Reviewed-by: Felix Singer Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai --- util/abuild/abuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 1adf0462ff..58f48f2b05 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -11,8 +11,8 @@ #set -x # Turn echo on.... -ABUILD_DATE="Nov 1, 2023" -ABUILD_VERSION="0.11.02" +ABUILD_DATE="Nov 18, 2023" +ABUILD_VERSION="0.11.03" TOP=$PWD @@ -823,12 +823,12 @@ while true ; do ;; --skip_set) shift skipconfig_set="$1" - customizing="${customizing}, Skipping CONFIG_${skipconfig_set}=Y" + customizing="${customizing}, Skipping builds with CONFIG_${skipconfig_set}=Y" shift ;; --skip_unset) shift skipconfig_unset="$1" - customizing="${customizing}, Skipping CONFIG_${skipconfig_unset} not set" + customizing="${customizing}, Skipping builds with CONFIG_${skipconfig_unset} not set" shift ;; --asserts) shift @@ -934,10 +934,10 @@ if echo "${skipconfig_set}${skipconfig_unset}" | grep -q "CONFIG_" >/dev/null 2> fi customizing=$(echo "$customizing" | cut -c3-) -if [ "$customizing" = "" ]; then - customizing="default configuration" +if [ -z "$customizing" ]; then + customizing="Default configuration" fi - +customizing="Config: ${customizing}" FAILED_BOARDS="$(realpath ${TARGET}/failed_boards)" PASSED_BOARDS="$(realpath ${TARGET}/passing_boards)"