Commit c7b02d7d authored Feb 09, 2018 by Peter Maydell

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>

parents 7e0019a7 04200a16

.travis.yml

+3 −3

Original line number	Diff line number	Diff line
		@@ -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