From 52dd19675299a75a8e92702a4b7700a16417ec22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 13 Mar 2018 14:18:06 +0000 Subject: [PATCH 1/3] .travis.yml: drop setting default log output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The log backend is the default one, we don't need to explicitly set it. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79377c8de0..92c343a1ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ env: - MAKEFLAGS="-j3" matrix: - CONFIG="" - - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log" + - CONFIG="--enable-debug --enable-debug-tcg" - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb" - CONFIG="--enable-modules --disable-linux-user" - CONFIG="--with-coroutine=ucontext --disable-linux-user" From ad20a090a5ecb85e2591ccc9ef03528e7f621873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 13 Mar 2018 14:20:55 +0000 Subject: [PATCH 2/3] .travis.yml: split default config into system and user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the build times have risen we keep timing out. Split the default config into system and user builds. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 92c343a1ef..75e5b408d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,8 @@ env: - TEST_CMD="make check" - MAKEFLAGS="-j3" matrix: - - CONFIG="" + - 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" - CONFIG="--enable-modules --disable-linux-user" From 0b438fa627ca192e4be2c527bf188706d64bdd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 13 Mar 2018 15:24:22 +0000 Subject: [PATCH 3/3] .travis.yml: add --disable-user with the rest of the disables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As all the disabled features only affect system emulation we might as well disable user mode to save compile time. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 75e5b408d0..c1e99237b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ env: - 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" + - 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"