diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2019-01-09 16:31:07 +0000 |
---|---|---|
committer | Alex Bennée <alex.bennee@linaro.org> | 2019-01-14 14:52:30 +0000 |
commit | 3e094234fdda40e4ca8033bdf976d3da98437aae (patch) | |
tree | 1dd7b206129f10cbd10407d62e0bdae32d606dde /.travis.yml | |
parent | 197be697f8e011528055b5b5bdf056a405ae330f (diff) | |
download | qemu-3e094234fdda40e4ca8033bdf976d3da98437aae.zip qemu-3e094234fdda40e4ca8033bdf976d3da98437aae.tar.gz qemu-3e094234fdda40e4ca8033bdf976d3da98437aae.tar.bz2 |
travis: define all the build matrix entries in one place
The current build matrix is constructed from entries listed under the
environment variable config section, as well as the general purpose
build matrix section. Move everything under the general purpose section
so it is clear at a glance what is in the matrix.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index bb43792..96917df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,14 +61,6 @@ env: - BUILD_DIR="." - TEST_CMD="make check" - MAKEFLAGS="-j3" - matrix: - - CONFIG="--disable-system" - - CONFIG="--disable-user" - - CONFIG="--enable-debug --enable-debug-tcg" - - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" - - CONFIG="--enable-modules --disable-linux-user" - - CONFIG="--with-coroutine=ucontext --disable-linux-user" - - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" git: @@ -89,6 +81,27 @@ script: matrix: include: + - env: CONFIG="--disable-system" + + + - env: CONFIG="--disable-user" + + + - env: CONFIG="--enable-debug --enable-debug-tcg" + + + - env: CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" + + + - env: CONFIG="--enable-modules --disable-linux-user" + + + - env: CONFIG="--with-coroutine=ucontext --disable-linux-user" + + + - env: CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + + # Test out-of-tree builds - env: CONFIG="--enable-debug --enable-debug-tcg" BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." |