[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/21] travis: stop redefining the script commands
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 12/21] travis: stop redefining the script commands |
Date: |
Mon, 14 Jan 2019 15:01:20 +0000 |
From: Daniel P. Berrangé <address@hidden>
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>
Signed-off-by: Alex Bennée <address@hidden>
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
--
2.17.1
- [Qemu-devel] [PULL 04/21] tests: update Fedora dockerfile to use Fedora 29, (continued)
- [Qemu-devel] [PULL 04/21] tests: update Fedora dockerfile to use Fedora 29, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 07/21] travis: add whitespace between each major section & matrix entry, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 01/21] docker: Use stable git tag for virglrenderer, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 05/21] tests: update Fedora i386 cross image to Fedora 29, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 08/21] travis: define all the build matrix entries in one place, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 20/21] tests: use g_usleep instead of rem = sleep(time), Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 09/21] travis: standardize the syntax used for env variables, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 15/21] travis: remove matrix settings that duplicate global settings, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 10/21] travis: don't clone git submodules upfront, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 02/21] tests: run ldconfig after installing extra software, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 12/21] travis: stop redefining the script commands,
Alex Bennée <=
- [Qemu-devel] [PULL 19/21] tests/docker: remove SID_AGE test hack, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 14/21] travis: run tests in verbose mode, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 18/21] tests/docker: update our Travis image, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 13/21] travis: stop using container based envs, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 21/21] Revert "tests: Disable qht-bench parallel test when using gprof", Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 16/21] docker: Use a stable snapshot for Debian Sid, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 11/21] travis: use homebrew addon for MacOSX, Alex Bennée, 2019/01/14
- [Qemu-devel] [PULL 17/21] travis: bump to Xenial baseline, Alex Bennée, 2019/01/14
- Re: [Qemu-devel] [PULL 00/21] misc testing fixes for Travis and docker, Peter Maydell, 2019/01/15