[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/13] travis: stop redefining the script commands
From: |
Daniel P . Berrangé |
Subject: |
[Qemu-devel] [PATCH 10/13] travis: stop redefining the script commands |
Date: |
Wed, 9 Jan 2019 16:31:11 +0000 |
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é <address@hidden>
---
.travis.yml | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b5f520034f..ddfef6d738 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,8 +59,7 @@ env:
global:
- SRC_DIR="."
- BUILD_DIR="."
- - TEST_CMD="make check"
- - MAKEFLAGS="-j3"
+ - TEST_CMD="make check -j3"
git:
@@ -72,7 +71,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:
@@ -253,9 +252,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
--
2.19.2
- [Qemu-devel] [PATCH 02/13] tests: remove obsolete 'debian' dockerfile, (continued)
- [Qemu-devel] [PATCH 02/13] tests: remove obsolete 'debian' dockerfile, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 04/13] tests: update Fedora i386 cross image to Fedora 29, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 06/13] travis: define all the build matrix entries in one place, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 01/13] tests: run ldconfig after installing extra software, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 03/13] tests: update Fedora dockerfile to use Fedora 29, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 08/13] travis: don't clone git submodules upfront, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 07/13] travis: standardize the syntax used for env variables, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the macOS matrix entries, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 10/13] travis: stop redefining the script commands,
Daniel P . Berrangé <=
- [Qemu-devel] [PATCH 11/13] travis: stop using container based envs, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 12/13] travis: run tests in verbose mode, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 13/13] travis: remove matrix settings that duplicate global settings, Daniel P . Berrangé, 2019/01/09
- Re: [Qemu-devel] [PATCH 00/13] Misc fixes / improvements for the docker and travis configs, no-reply, 2019/01/13