diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2019-01-09 16:31:11 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-01-14 14:52:30 +0000 |
| commit | 9b29d0490d3f8b912d7a635004c89f9ef0a61b52 (patch) | |
| tree | 65ca793161a9067dca6eb61207d5fc75988524af | |
| parent | 91fa7dd100c9ce2d46e7cefddd935207e8a54ec7 (diff) | |
| download | focaccia-qemu-9b29d0490d3f8b912d7a635004c89f9ef0a61b52.tar.gz focaccia-qemu-9b29d0490d3f8b912d7a635004c89f9ef0a61b52.zip | |
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>
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 2ef7997d25..7b18d33e9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,8 +65,7 @@ env: global: - SRC_DIR="." - BUILD_DIR="." - - TEST_CMD="make check" - - MAKEFLAGS="-j3" + - TEST_CMD="make check -j3" git: @@ -78,7 +77,7 @@ before_script: - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } script: - - make ${MAKEFLAGS} && ${TEST_CMD} + - make -j3 && ${TEST_CMD} matrix: @@ -255,9 +254,7 @@ matrix: - env: - CONFIG="--disable-system --disable-docs" - - TEST_CMD="make check-tcg" - script: - - make ${MAKEFLAGS} && ${TEST_CMD} ${MAKEFLAGS} + - TEST_CMD="make -j3 check-tcg" sudo: required dist: trusty compiler: gcc |