build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69838 )
Change subject: util/testing: Call test-tools target from what-jenkins-does
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-164088):
https://review.coreboot.org/c/coreboot/+/69838/comment/099695af_0a464fe2
PS1, Line 11:
Possible repeated word: 'the'
--
To view, visit https://review.coreboot.org/c/coreboot/+/69838
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id62d6bb1e729892ec123ea970ca8a31e03a812d0
Gerrit-Change-Number: 69838
Gerrit-PatchSet: 1
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Sun, 20 Nov 2022 17:12:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/69862 )
Change subject: fix abuild
......................................................................
Abandoned
Not meant to be pushed
--
To view, visit https://review.coreboot.org/c/coreboot/+/69862
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id3a2fe397875f6305dc673033142042b23147ba0
Gerrit-Change-Number: 69862
Gerrit-PatchSet: 1
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-MessageType: abandon
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69836 )
Change subject: util/testing: Call test-abuild target from what-jenkins-does
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-164086):
https://review.coreboot.org/c/coreboot/+/69836/comment/cc6c0616_0b0ddeac
PS1, Line 14:
Possible repeated word: 'the'
--
To view, visit https://review.coreboot.org/c/coreboot/+/69836
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4552193894c16301defb851eb3db4bdfbfa49803
Gerrit-Change-Number: 69836
Gerrit-PatchSet: 1
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Sun, 20 Nov 2022 17:12:00 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69835 )
Change subject: util/testing: Call test-lint target from what-jenkins-does
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-164085):
https://review.coreboot.org/c/coreboot/+/69835/comment/1271f829_7f5f3b50
PS1, Line 12:
Possible repeated word: 'the'
--
To view, visit https://review.coreboot.org/c/coreboot/+/69835
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2f90df76126f453fbcd91f4c4af5d784ac2dbe88
Gerrit-Change-Number: 69835
Gerrit-PatchSet: 1
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Sun, 20 Nov 2022 17:11:34 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Martin L Roth has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/69859 )
Change subject: util/abuild: Add --name option to set name of abuild run
......................................................................
util/abuild: Add --name option to set name of abuild run
Previously, the testclass variable was only updated with the chromeos
or Kconfig option values, and the output directory and xml file names
were updated independently.
With the --name option, all of these can be set simultaneously. This
also prevents jenkins from seeing clang and gcc tests as the same
because the testclass variable wasn't updated.
If --name is not set, all behavior is as it was previously.
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
Change-Id: I8f52779b92d213386a3eb371d1f30ee32ed48b85
---
M util/abuild/abuild
1 file changed, 57 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/69859/2
--
To view, visit https://review.coreboot.org/c/coreboot/+/69859
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I8f52779b92d213386a3eb371d1f30ee32ed48b85
Gerrit-Change-Number: 69859
Gerrit-PatchSet: 2
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-MessageType: newpatchset
Martin L Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69859 )
Change subject: util/abuild: Add --name option to set name of abuild run
......................................................................
util/abuild: Add --name option to set name of abuild run
Previously, the testclass variable was only updated with the chromeos
or Kconfig option values, and the output directory and xml file names
were updated independently.
With the --name option, all of these can be set simultaneously. This
also prevents jenkins from seeing clang and gcc tests as the same
because the testclass variable wasn't updated.
If --name is not set, all behavior is as it was previously.
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
Change-Id: I8f52779b92d213386a3eb371d1f30ee32ed48b85
---
M util/abuild/abuild
1 file changed, 55 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/69859/1
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 43dd833..270a492 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -17,9 +17,15 @@
TOP=$PWD
# Where shall we place all the build trees?
-TARGET=${COREBOOT_BUILD_DIR:-coreboot-builds}
-XMLFILE=$TOP/abuild.xml
-REAL_XMLFILE=$XMLFILE
+TARGET_DEFAULT=coreboot-builds
+TARGET=${COREBOOT_BUILD_DIR:-${TARGET_DEFAULT}}
+XML_DEFAULT="$TOP/abuild.xml"
+XMLFILE="${XML_DEFAULT}"
+REAL_XMLFILE="${XML_DEFAULT}"
+
+# Name associated with a run of abuild
+TESTRUN_DEFAULT=default
+TESTRUN="${TESTRUN_DEFAULT}"
export KCONFIG_OVERWRITECONFIG=1
@@ -367,7 +373,7 @@
etime=$(perl -e 'print time();' 2>/dev/null || date +%s)
duration=$(( etime - stime ))
- junit " <testcase classname='board${testclass/#/.}' name='$BUILD_NAME' time='$duration' >"
+ junit " <testcase classname='${TESTRUN}${testclass/#/.}' name='$BUILD_NAME' time='$duration' >"
if [ $MAKE_FAILED -eq 0 ]; then
junit "<system-out>"
@@ -465,7 +471,7 @@
fi
if [ $BUILDENV_CREATED -ne 0 ] || [ $MAINBOARD_OK -ne 0 ] || [ $VENDOR_OK -ne 0 ] || [ $FORCE_ENABLED_CROS -eq 1 ]; then
- junit " <testcase classname='board${testclass/#/.}' name='$BUILD_NAME' >"
+ junit " <testcase classname='${TESTRUN}${testclass/#/.}' name='$BUILD_NAME' >"
junit "<failure type='BuildFailed'>"
junitfile "$build_dir/config.log"
@@ -581,7 +587,7 @@
$0 [-V|--version]
$0 [-h|--help]
-Options:\n"
+Options:\n
[-a|--all] Build previously succeeded ports as well
[-A|--any-toolchain] Use any toolchain
[-b|--board-variant <name>] Build specific board variant under the
@@ -596,6 +602,8 @@
[-K|--kconfig <name>] Prepend file to generated Kconfig
[-l|--loglevel <num>] Set loglevel
[-L|--clang] Use clang on supported arch
+ [-n|--name] Set build name - also sets xmlfile if not
+ already set
[-o|--outdir <path>] Store build results in path
(defaults to $TARGET)
[-p|--payloads <dir>] Use payloads in <dir> to build images
@@ -663,12 +671,12 @@
# shellcheck disable=SC2086
if [ "${getoptbrand:0:6}" == "getopt" ]; then
# Detected GNU getopt that supports long options.
- args=$(getopt -l version,verbose,quiet,help,all,target:,board-variant:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,any-toolchain,clean,clean-somewhat,outdir:,chromeos,xmlfile:,kconfig:,dir:,root:,recursive,checksum:,timeless,exitcode,asserts -o Vvqhat:b:p:c:sJCl:rP:uyBLAzZo:xX:K:d:R:Ie -- "$@") || exit 1
+ args=$(getopt -l version,verbose,quiet,help,all,target:,board-variant:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,any-toolchain,clean,clean-somewhat,outdir:,chromeos,xmlfile:,kconfig:,dir:,root:,recursive,checksum:,timeless,exitcode,asserts,name: -o Vvqhat:b:p:c:sJCl:rP:uyBLAzZo:xX:K:d:R:Ien: -- "$@") || exit 1
eval set -- $args
retval=$?
else
# Detected non-GNU getopt
- args=$(getopt Vvqhat:b:p:c:sJCl:rP:uyBLAZzo:xX:K:d:R:Ie "$@")
+ args=$(getopt Vvqhat:b:p:c:sJCl:rP:uyBLAZzo:xX:K:d:R:Ien: "$@")
set -- $args
retval=$?
fi
@@ -762,13 +770,19 @@
-o|--outdir) shift
TARGET=$1; shift
;;
+ -n|--name) shift
+ TESTRUN=$1
+ shift;;
-x|--chromeos) shift
chromeos=true
testclass=chromeos
customizing="${customizing}, chromeos"
configoptions="${configoptions}CONFIG_CHROMEOS=y\nCONFIG_VBOOT_MEASURED_BOOT=y\n"
;;
- -X|--xmlfile) shift; XMLFILE=$1; REAL_XMLFILE=$1; shift;;
+ -X|--xmlfile) shift
+ XMLFILE=$1
+ REAL_XMLFILE=$1
+ shift;;
-I|--recursive) shift; recursive=true;;
-K|--kconfig) shift
testclass="$(basename "$1" | tr '.' '_' )"
@@ -782,6 +796,18 @@
*) break;;
esac
done
+
+if [[ "${TESTRUN}" != "${TESTRUN_DEFAULT}" ]]; then
+ unset testclass
+ if [[ "${XML_UPDATED}" != "${XML_DEFAULT}" ]]; then
+ XMLFILE="abuild-${TESTRUN}.xml"
+ REAL_XMLFILE="${XMLFILE}"
+ fi
+ if [[ "${TARGET}" == "${TARGET_DEFAULT}" ]]; then
+ TARGET="${TESTRUN}"
+ fi
+fi
+
if [ -n "$1" ]; then
printf "Invalid option '%s'\n\n" "$1"; myhelp; exit 1;
fi
--
To view, visit https://review.coreboot.org/c/coreboot/+/69859
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I8f52779b92d213386a3eb371d1f30ee32ed48b85
Gerrit-Change-Number: 69859
Gerrit-PatchSet: 1
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-MessageType: newchange