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>
This commit is contained in:
		
							parent
							
								
									6ca9f7fedb
								
							
						
					
					
						commit
						f4089dc8da
					
				| 
						 | 
					@ -46,6 +46,7 @@ notifications:
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  global:
 | 
					  global:
 | 
				
			||||||
    - TEST_CMD="make check"
 | 
					    - TEST_CMD="make check"
 | 
				
			||||||
 | 
					    - MAKEFLAGS="-j3"
 | 
				
			||||||
  matrix:
 | 
					  matrix:
 | 
				
			||||||
    - CONFIG=""
 | 
					    - CONFIG=""
 | 
				
			||||||
    - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log"
 | 
					    - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log"
 | 
				
			||||||
| 
						 | 
					@ -64,7 +65,7 @@ before_install:
 | 
				
			||||||
before_script:
 | 
					before_script:
 | 
				
			||||||
  - ./configure ${CONFIG}
 | 
					  - ./configure ${CONFIG}
 | 
				
			||||||
script:
 | 
					script:
 | 
				
			||||||
  - make -j3 && ${TEST_CMD}
 | 
					  - make ${MAKEFLAGS} && ${TEST_CMD}
 | 
				
			||||||
matrix:
 | 
					matrix:
 | 
				
			||||||
  include:
 | 
					  include:
 | 
				
			||||||
    # Test with CLang for compile portability
 | 
					    # Test with CLang for compile portability
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue