From: Simon Glass <sjg@chromium.org>
Date: Wed, 18 Mar 2020 15:43:00 +0000 (-0600)
Subject: travis/gitlab/azure: Drop repeated buildman call with test.py
X-Git-Tag: v2020.07-rc1~41^2^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7ec1255ceacea72e813d5ea9a6a8c940716b147b;p=oweals%2Fu-boot.git

travis/gitlab/azure: Drop repeated buildman call with test.py

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@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 48fb1b8e61..8c3bb0abfd 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -265,12 +265,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 -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
+          tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -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 c64911207f..a4f8a71991 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,14 +38,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 -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
+    - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -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 176cf0c6f2..bd2ac4ee27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -232,14 +232,8 @@ script:
      if [[ -e ~/grub_riscv64.efi ]]; then
        cp ~/grub_riscv64.efi $UBOOT_TRAVIS_BUILD_DIR/;
      fi;
-     ret=0;
-     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 -se -o ${UBOOT_TRAVIS_BUILD_DIR} -w
-         --board ${TEST_PY_BD};
-       exit $ret;
-     fi;
+     tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -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;