diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-21 15:19:58 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-21 15:19:58 +0100 |
| commit | 6f1d2d1c5ad20d464705b17318cb7ca495f8078a (patch) | |
| tree | 24229462ca803ce82f14ed8c2824f542348b1173 | |
| parent | 55543e7623777108476820558862012a2d3bd4cf (diff) | |
| parent | 23654d45f8ac08e3725831d812eb8dcf74e5a0a0 (diff) | |
| download | qemu-6f1d2d1c5ad20d464705b17318cb7ca495f8078a.zip qemu-6f1d2d1c5ad20d464705b17318cb7ca495f8078a.tar.gz qemu-6f1d2d1c5ad20d464705b17318cb7ca495f8078a.tar.bz2 | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-20160621-1' into staging
This pull request contains:
- disable sparse testing
- add trusty build target
- add libnfs-dev for NFS block driver
These are the same patches posted last week for any last minute review.
# gpg: Signature made Tue 21 Jun 2016 10:06:34 BST
# 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-20160621-1:
.travis.yml: disable Sparse testing
.travis.yml: add trusty GCE target
.travis.yml: add libnfs-dev for NFS block driver
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 50ac17f..c13881e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ addons: - libgtk-3-dev - libiscsi-dev - liblttng-ust-dev + - libnfs-dev - libncurses5-dev - libnss3-dev - libpixman-1-dev @@ -63,9 +64,6 @@ script: - make -j3 && ${TEST_CMD} matrix: include: - # Sparse is GCC only - - env: CONFIG="--enable-sparse" - compiler: gcc # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie" compiler: gcc @@ -88,3 +86,13 @@ matrix: - env: CONFIG="" os: osx compiler: clang + - env: CONFIG="" + sudo: required + addons: + dist: trusty + compiler: gcc + before_install: + - sudo apt-get update -qq + - 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 |