travis: stop redefining the script commands
One of the matrix entries redefines the script command in order to add the ${MAKEFLAGS} variable. Ideally ${MAKEFLAGS} would be referenced by the definition of the ${TEST_CMD} env variable, but this isn't possible in travis. ${MAKEFLAGS} exists to eliminate duplication of flags in every "make" command, but this cure causes a worse problem, namely the reduplication of the "script" command. It is simpler to just insert "-j3" directly into any "make" command. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
parent
91fa7dd100
commit
9b29d0490d
|
@ -65,8 +65,7 @@ env:
|
||||||
global:
|
global:
|
||||||
- SRC_DIR="."
|
- SRC_DIR="."
|
||||||
- BUILD_DIR="."
|
- BUILD_DIR="."
|
||||||
- TEST_CMD="make check"
|
- TEST_CMD="make check -j3"
|
||||||
- MAKEFLAGS="-j3"
|
|
||||||
|
|
||||||
|
|
||||||
git:
|
git:
|
||||||
|
@ -78,7 +77,7 @@ before_script:
|
||||||
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
|
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
|
||||||
- ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }
|
- ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }
|
||||||
script:
|
script:
|
||||||
- make ${MAKEFLAGS} && ${TEST_CMD}
|
- make -j3 && ${TEST_CMD}
|
||||||
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -255,9 +254,7 @@ matrix:
|
||||||
|
|
||||||
- env:
|
- env:
|
||||||
- CONFIG="--disable-system --disable-docs"
|
- CONFIG="--disable-system --disable-docs"
|
||||||
- TEST_CMD="make check-tcg"
|
- TEST_CMD="make -j3 check-tcg"
|
||||||
script:
|
|
||||||
- make ${MAKEFLAGS} && ${TEST_CMD} ${MAKEFLAGS}
|
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: trusty
|
dist: trusty
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
|
Loading…
Reference in New Issue