summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-01-07 16:44:21 -0700
committerSimon Glass <sjg@chromium.org>2019-01-14 17:47:13 -0700
commite9500f49ea350b14973bdacd9948f9c2177ff2a8 (patch)
treeee432cb8db157523c4a8632bbaabeed61f7d3711 /.travis.yml
parent00beb2485f71ab23114b37ef47d136e269ef69f7 (diff)
travis: Use buildman for building with clang
Now that buildman supports clang, use it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 3 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 321fd793a7..fc4d5a1d5c 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;
@@ -351,7 +344,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"