From f4089dc8da4e7135600093c6afac8c83fb7057a1 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 17 Jul 2017 21:31:30 -0300 Subject: [PATCH] travis: move make -j flag out of script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because global environment variables can be overridden when .travis.yml is processed by the docker-travis target, the effect of this patch is that docker-travis now obeys the "J=n" option. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c7a5cbe25..f583839755 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ notifications: env: global: - TEST_CMD="make check" + - MAKEFLAGS="-j3" matrix: - CONFIG="" - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log" @@ -64,7 +65,7 @@ before_install: before_script: - ./configure ${CONFIG} script: - - make -j3 && ${TEST_CMD} + - make ${MAKEFLAGS} && ${TEST_CMD} matrix: include: # Test with CLang for compile portability