[U-Boot,3/3] travis: Use buildman for building with clang

Message ID 20181205123528.55097-3-sjg@chromium.org
State New
Delegated to: Simon Glass
Headers show
Series
  • [U-Boot,1/3] buildman: Drop comment about Ctrl-C problem
Related show

Commit Message

Simon Glass Dec. 5, 2018, 12:35 p.m.
Now that buildman supports clang, use it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 .travis.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Comments

Tom Rini Dec. 6, 2018, 1:31 a.m. | #1
On Wed, Dec 05, 2018 at 05:35:28AM -0700, Simon Glass wrote:

> Now that buildman supports clang, use it.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Tom Rini <trini@konsulko.com>

Patch

diff --git a/.travis.yml b/.travis.yml
index a061f02399c..59a00d065e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,16 +109,9 @@  script:
  #
  # From buildman, exit code 129 means warnings only.  If we've been asked to
  # use clang only do one configuration.
- - if [[ "${TOOLCHAIN}" == "clang" ]]; then
+ - if [[ "${BUILDMAN}" != "" ]]; then
      ret=0;
-     make O=../.bm-work/${TEST_PY_BD} HOSTCC=clang-7 CC=clang-7 -j$(nproc)
-       KCFLAGS=-Werror sandbox_config all || ret=$?;
-     if [[ $ret -ne 0 ]]; then
-       exit $ret;
-     fi;
-   elif [[ "${BUILDMAN}" != "" ]]; then
-     ret=0;
-     tools/buildman/buildman -P -E ${BUILDMAN} || ret=$?;
+     tools/buildman/buildman -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?;
      if [[ $ret -ne 0 && $ret -ne 129 ]]; then
        tools/buildman/buildman -sdeP ${BUILDMAN};
        exit $ret;
@@ -343,7 +336,7 @@  matrix:
       env:
         - TEST_PY_BD="sandbox"
           BUILDMAN="^sandbox$"
-          TOOLCHAIN="clang"
+          OVERRIDE="clang-7"
     - name: "test/py sandbox_spl"
       env:
         - TEST_PY_BD="sandbox_spl"