diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-09 16:12:34 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-09 16:12:34 +0000 |
| commit | c7b02d7d032d6022060e4b393827c963c93ce63f (patch) | |
| tree | ecf947ce6293e4372ad96dbc2501f9b72996d90b | |
| parent | 7e0019a7196ebed177c95824875cf852e1a6f667 (diff) | |
| parent | 04200a1674bfc20784f1fc105cbc22bd9be779e8 (diff) | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-speedup-090218-1' into staging
One patch to mitigate Travis timeouts
# gpg: Signature made Fri 09 Feb 2018 14:13:46 GMT
# gpg: using RSA key FBD0DB095A9E2A44
# 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-speedup-090218-1:
.travis.yml: add --disable-linux-user for some jobs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 01a57399b5..0dd5020552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,9 +52,9 @@ env: - CONFIG="" - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log" - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb" - - CONFIG="--enable-modules" - - CONFIG="--with-coroutine=ucontext" - - CONFIG="--with-coroutine=sigaltstack" + - CONFIG="--enable-modules --disable-linux-user" + - CONFIG="--with-coroutine=ucontext --disable-linux-user" + - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" git: # we want to do this ourselves submodules: false |