diff options
| author | Paolo Bonzini | 2017-07-18 02:31:30 +0200 |
|---|---|---|
| committer | Alex Bennée | 2017-07-18 10:39:19 +0200 |
| commit | f4089dc8da4e7135600093c6afac8c83fb7057a1 (patch) | |
| tree | 549576c4c6545e1b6abf468a427e7f169c399933 /.travis.yml | |
| parent | docker: allow customizing Travis global_env variables (diff) | |
| download | qemu-f4089dc8da4e7135600093c6afac8c83fb7057a1.tar.gz qemu-f4089dc8da4e7135600093c6afac8c83fb7057a1.tar.xz qemu-f4089dc8da4e7135600093c6afac8c83fb7057a1.zip | |
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>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
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 |