From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 18 Jul 2017 00:31:30 +0000 (-0300)
Subject: travis: move make -j flag out of script
X-Git-Tag: v2.10.0-rc0~18^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4089dc8da4e7135600093c6afac8c83fb7057a1;p=thirdparty%2Fqemu.git

travis: move make -j flag out of script

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 <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---

diff --git a/.travis.yml b/.travis.yml
index 3c7a5cbe255..f5838397552 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