[PATCH v2 22/23] travis/gitlab/azure: Drop repeated buildman call with test.py
Simon Glass
sjg at chromium.org
Mon Mar 16 00:43:02 CET 2020
It does not seem to be necessary to run buildman again to show errors,
since any errors can be shown by the first invocation and there is only
a single board being built. Update this to simplify the code, using the
-e flag to make sure errors are shown.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v2:
- Add new patch to drop the repeated buildman call
.azure-pipelines.yml | 7 +------
.gitlab-ci.yml | 10 ++--------
.travis.yml | 10 ++--------
3 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index cb446ff3da..cd3920dfff 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -246,12 +246,7 @@ jobs:
# the below corresponds to .gitlab-ci.yml "script"
cd ${WORK_DIR}
export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD};
- ret=0;
- tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -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
+ tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -W -e --board ${TEST_PY_BD} ${OVERRIDE}
virtualenv -p /usr/bin/python3 /tmp/venv
. /tmp/venv/bin/activate
pip install -r test/py/requirements.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ba281e3e4..1606baf343 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,14 +29,8 @@ stages:
script:
# 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 -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
+ - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -W -e
+ --board ${TEST_PY_BD} ${OVERRIDE}
- virtualenv -p /usr/bin/python3 /tmp/venv
- . /tmp/venv/bin/activate
- pip install -r test/py/requirements.txt
diff --git a/.travis.yml b/.travis.yml
index ecfbc6c625..35fac88fef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -134,14 +134,8 @@ script:
cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/;
cp ~/grub2-arm/usr/lib/grub2/arm-efi/grub.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm.efi;
cp ~/grub2-arm64/usr/lib/grub2/arm64-efi/grub.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm64.efi;
- ret=0;
- tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -W
- --board ${TEST_PY_BD} ${OVERRIDE}|| ret=$?;
- if [[ $ret -ne 0 ]]; then
- tools/buildman/buildman -se -o ${UBOOT_TRAVIS_BUILD_DIR} -w
- --board ${TEST_PY_BD};
- exit $ret;
- fi;
+ tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -W -e
+ --board ${TEST_PY_BD} ${OVERRIDE} || exit;
virtualenv -p /usr/bin/python3 /tmp/venv;
. /tmp/venv/bin/activate;
pip install -r test/py/requirements.txt;
--
2.25.1.481.gfbce0eb801-goog
More information about the U-Boot
mailing list