diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-13 14:02:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-13 14:02:30 +0000 |
| commit | fdbd92f738693abfda60d2d1fc075cd796f33f80 (patch) | |
| tree | 1b2dd160d2aaec9b06027427d8d796cbfdc7baf8 | |
| parent | 8417cd0029b5b0841fa4b3f3f74397a2ec63d1af (diff) | |
| parent | ae1a772c5607f25cbdc80063f0f5a85290434058 (diff) | |
| download | qemu-fdbd92f738693abfda60d2d1fc075cd796f33f80.zip qemu-fdbd92f738693abfda60d2d1fc075cd796f33f80.tar.gz qemu-fdbd92f738693abfda60d2d1fc075cd796f33f80.tar.bz2 | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-20170112-1' into staging
A couple of fixes to reduce the matrix some more that just missed the
last iteration.
# gpg: Signature made Thu 12 Jan 2017 13:01:49 GMT
# gpg: using RSA key 0xFBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-travis-20170112-1:
travis: add Trusty with clang stable build
travis: trim out most clang builds
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 9916178..d83e2d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - "2.4" compiler: - gcc - - clang cache: ccache addons: apt: @@ -68,6 +67,9 @@ script: - make -j3 && ${TEST_CMD} matrix: include: + # Test with CLang for compile portability + - env: CONFIG="" + compiler: clang # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie" compiler: gcc @@ -101,6 +103,26 @@ matrix: - sudo apt-get build-dep -qq qemu - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive + # Trusty build with latest stable clang + - env: CONFIG="" + sudo: required + addons: + dist: trusty + language: generic + compiler: none + env: + - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 + - CONFIG="--cc=clang-3.9 --cxx=clang++-3.9" + before_install: + - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main' + - sudo apt-get update -qq + - sudo apt-get install -qq -y clang-3.9 + - sudo apt-get build-dep -qq qemu + - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ + - git submodule update --init --recursive + before_script: + - ./configure ${CONFIG} || cat config.log # Using newer GCC with sanitizers - addons: apt: |