diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 14:04:20 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 14:04:20 +0000 |
commit | ef80b99ce7ffbd66b3efd493f4ca99f8abf59e79 (patch) | |
tree | 6a81d63dd33aac4e490d4a0f56c64880e190c196 /.travis.yml | |
parent | 59a568b57848b10e8a44518a889323f12ccdd8f4 (diff) | |
parent | 4300dadc00bec6d75283ffbe1fd85c2b442bef2d (diff) |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-220219-1' into staging
Various testing fixes:
- Travis updates (inc disable isapc cdrom test)
- Add gitlab control
- Fix docker image
- keep softloat tests short
# gpg: Signature made Fri 22 Feb 2019 09:51:36 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-next-220219-1:
tests/cdrom-test: only include isapc cdrom test when g_test_slow()
tests/softfloat: always do quick softfloat tests
Add a gitlab-ci file for Continuous Integration testing on Gitlab
tests/docker: peg netmap code to a specific version
tests/docker: squash initial update and install step for debian9
.travis.yml: Remove disable-uuid
.travis.yml: Test with disable-replication
.travis.yml: split debug builds
.travis.yml: the xcode10 image seems to be hosed
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index baa06b976a..cca57f4314 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,11 +86,16 @@ matrix: - env: - - CONFIG="--enable-debug --enable-debug-tcg" + - CONFIG="--enable-debug --enable-debug-tcg --disable-user" + # TCG debug can be run just on it's own and is mostly agnostic to user/softmmu distinctions - env: - - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" + - CONFIG="--enable-debug-tcg --disable-system" + + + - env: + - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-user --disable-replication" - env: @@ -174,13 +179,6 @@ matrix: compiler: clang - - env: - - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" - os: osx - osx_image: xcode10 - compiler: clang - - # Python builds - env: - CONFIG="--target-list=x86_64-softmmu" |