[PATCH v3 19/23] travis/gitlab/azure: Use -W to avoid warnings check
Michal Simek
monstr at monstr.eu
Wed Apr 15 09:30:46 CEST 2020
Hi Simon,
st 18. 3. 2020 v 16:48 odesílatel Simon Glass <sjg at chromium.org> napsal:
>
> We can use the -W flag to tell buildman to ignore warnings. Since we also
> have -E defined, compiler warnings are promoted to errors, so they will
> still cause a failure. But migration warnings of the form:
>
> ===================== WARNING ======================
> This board does not use CONFIG_DM. CONFIG_DM will be
> compulsory starting with the v2020.01 release.
> Failure to update may result in board removal.
> See doc/driver-model/migration.rst for more info.
>
> will now be ignored.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Fixes: 329f5ef51d2 (travis.yml: run buildman with option -E)
> ---
>
> Changes in v3:
> - Bring back the -E flag and add -W
> - Rewrite the commit message
>
> Changes in v2:
> - Add Fixes tag
> - Just drop the -E flag
> - Update travis, azure also
>
> .azure-pipelines.yml | 8 ++++----
> .gitlab-ci.yml | 23 +++++++++++------------
> .travis.yml | 13 ++++++-------
> 3 files changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
> index 50d00fa899..a97a3f8b19 100644
> --- a/.azure-pipelines.yml
> +++ b/.azure-pipelines.yml
> @@ -247,8 +247,8 @@ jobs:
> cd ${WORK_DIR}
> export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD};
> ret=0;
> - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
> + if [[ $ret -ne 0 ]]; then
> tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -se --board ${TEST_PY_BD};
> exit $ret;
> fi
> @@ -396,8 +396,8 @@ jobs:
> cat << "EOF" >> build.sh
> if [[ "${BUILDMAN}" != "" ]]; then
> ret=0;
> - tools/buildman/buildman -o /tmp -P -E ${BUILDMAN} ${OVERRIDE} || ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + tools/buildman/buildman -o /tmp -P -W ${BUILDMAN} ${OVERRIDE} || ret=$?;
> + if [[ $ret -ne 0 ]]; then
> tools/buildman/buildman -o /tmp -seP ${BUILDMAN};
> exit $ret;
> fi;
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 48b90b2ba3..501e3ff3ab 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -27,13 +27,12 @@ stages:
> after_script:
> - rm -rf /tmp/uboot-test-hooks /tmp/venv
> script:
> - # From buildman, exit code 129 means warnings only. If we've been asked to
> - # use clang only do one configuration.
> + # If we've been asked to use clang only do one configuration.
> - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}
> - ret=0;
> - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E
> + tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W
> --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + if [[ $ret -ne 0 ]]; then
> tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -se
> --board ${TEST_PY_BD};
> exit $ret;
> @@ -57,8 +56,8 @@ build all 32bit ARM platforms:
> stage: world build
> script:
> - ret=0;
> - ./tools/buildman/buildman -o /tmp -P -E arm -x aarch64 || ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + ./tools/buildman/buildman -o /tmp -P -E -W arm -x aarch64 || ret=$?;
> + if [[ $ret -ne 0 ]]; then
> ./tools/buildman/buildman -o /tmp -seP;
> exit $ret;
> fi;
> @@ -71,8 +70,8 @@ build all 64bit ARM platforms:
> - . /tmp/venv/bin/activate
> - pip install pyelftools
> - ret=0;
> - ./tools/buildman/buildman -o /tmp -P -E aarch64 || ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + ./tools/buildman/buildman -o /tmp -P -E -W aarch64 || ret=$?;
> + if [[ $ret -ne 0 ]]; then
> ./tools/buildman/buildman -o /tmp -seP;
> exit $ret;
> fi;
> @@ -82,8 +81,8 @@ build all PowerPC platforms:
> stage: world build
> script:
> - ret=0;
> - ./tools/buildman/buildman -o /tmp -P -E powerpc || ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + ./tools/buildman/buildman -o /tmp -P -E -W powerpc || ret=$?;
> + if [[ $ret -ne 0 ]]; then
> ./tools/buildman/buildman -o /tmp -seP;
> exit $ret;
> fi;
> @@ -93,8 +92,8 @@ build all other platforms:
> stage: world build
> script:
> - ret=0;
> - ./tools/buildman/buildman -o /tmp -P -E -x arm,powerpc || ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + ./tools/buildman/buildman -o /tmp -P -E -W -x arm,powerpc || ret=$?;
> + if [[ $ret -ne 0 ]]; then
> ./tools/buildman/buildman -o /tmp -seP;
> exit $ret;
> fi;
> diff --git a/.travis.yml b/.travis.yml
> index 887654ca96..bf3ef4860b 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -116,13 +116,12 @@ script:
> # Comments must be outside the command strings below, or the Travis parser
> # will get confused.
> #
> - # From buildman, exit code 129 means warnings only. If we've been asked to
> - # use clang only do one configuration.
> + # If we've been asked to use clang only do one configuration.
> + #
> # Build a selection of boards if TEST_PY_BD is empty
> - if [[ "${BUILDMAN}" != "" ]]; then
> - ret=0;
> - tools/buildman/buildman -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?;
> - if [[ $ret -ne 0 && $ret -ne 129 ]]; then
> + tools/buildman/buildman -P -E -W ${BUILDMAN} ${OVERRIDE};
> + if [[ $ret -ne 0 ]]; then
I am curious about missing || ret = $? here.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
More information about the U-Boot
mailing list