aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-10-07 14:20:30 -0400
committerTom Rini <trini@konsulko.com>2018-10-19 14:16:43 -0400
commit4030f166f92eba4ddb49f8a1224dc09d4f9882be (patch)
tree877941d55e551e10ee5e2125e99a61f3062e6ea9
parent758694ff076255115b6cd936b13108db3773ee57 (diff)
downloadu-boot-4030f166f92eba4ddb49f8a1224dc09d4f9882be.zip
u-boot-4030f166f92eba4ddb49f8a1224dc09d4f9882be.tar.gz
u-boot-4030f166f92eba4ddb49f8a1224dc09d4f9882be.tar.bz2
travis: Add sandbox/clang-7 support
To make testing with clang support easier, add sandbox/clang-7 combination to our testing matrix. To facilitate this, switch to using the "sources" method that the travis.yml file supports to list additional repositories and add the official one for llvm-7. Due to buildman not supporting using clang at this time add logic to manually build a single sandbox configuration in the expected output directory so that we can still invoke all of our tests. Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--.travis.yml27
1 files changed, 20 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 89028cb..6697664 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ language: c
addons:
apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ - llvm-toolchain-trusty-7
packages:
- cppcheck
- sloccount
@@ -28,11 +31,8 @@ addons:
- device-tree-compiler
- lzop
- liblz4-tool
-
-before_install:
- - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- - sudo apt-get update -q
- - sudo apt-get install libisl15 -y
+ - libisl15
+ - clang-7
install:
# Clone uboot-test-hooks
@@ -105,8 +105,16 @@ script:
# Comments must be outside the command strings below, or the Travis parser
# will get confused.
#
- # Exit code 129 means warnings only.
- - if [[ "${BUILDMAN}" != "" ]]; then
+ # From buildman, exit code 129 means warnings only. If we've been asked to
+ # use clang only do one configuration.
+ - if [[ "${TOOLCHAIN}" == "clang" ]]; 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=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then
@@ -322,6 +330,11 @@ matrix:
- TEST_PY_BD="sandbox"
BUILDMAN="^sandbox$"
TOOLCHAIN="i386"
+ - name: "test/py sandbox with clang"
+ env:
+ - TEST_PY_BD="sandbox"
+ BUILDMAN="^sandbox$"
+ TOOLCHAIN="clang"
- name: "test/py sandbox_spl"
env:
- TEST_PY_BD="sandbox_spl"