Hi Alex, On 2/1/19 6:12 PM, Alex Bennée wrote: > Re-building the tools and documents by default is a little wasteful as > they are not really affected by the main build options. Split tools > and documents into their own task with a minimal softmmu and > linux-user target list just to check they don't interact badly. > > Signed-off-by: Alex Bennée <[email protected]> > --- > .travis.yml | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index 87d9fa971c..1c8effcf63 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -61,6 +61,7 @@ env: > global: > - SRC_DIR="." > - BUILD_DIR="." > + - BASE_CONFIG="--disable-docs --disable-tools" > - TEST_CMD="make check -j3 V=1" > > > @@ -71,7 +72,7 @@ git: > > before_script: > - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} > - - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } > + - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && > exit 1; } > script: > - make -j3 && ${TEST_CMD} > > @@ -106,6 +107,15 @@ matrix: > - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" > > > + # Check we can build docs and tools > + - env: > + - BASE_CONFIG=""
What about using explicit configure options? BASE_CONFIG="--enable-docs --enable-tools" Regardless: Reviewed-by: Philippe Mathieu-Daudé <[email protected]> > + - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user" > + addons: > + apt: > + packages: > + - python-sphinx > + > # Test out-of-tree builds > - env: > - CONFIG="--enable-debug --enable-debug-tcg" > @@ -243,5 +253,5 @@ matrix: > > > - env: > - - CONFIG="--disable-system --disable-docs" > + - CONFIG="--disable-system" > - TEST_CMD="make -j3 check-tcg V=1" >
