Commit fdbd92f7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8417cd00 ae1a772c

.travis.yml

+23 −1
Original line number Diff line number Diff line
@@ -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: