[PULL,12/21] travis: stop redefining the script commands

Message ID	20190114150129.1013-13-alex.bennee@linaro.org
State	Accepted
Commit	9b29d0490d3f8b912d7a635004c89f9ef0a61b52
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:20 +0000 Message-Id: <20190114150129.1013-13-alex.bennee@linaro.org> In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 12/21] travis: stop redefining the script commands Precedence: list Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	misc testing fixes for Travis and docker \| expand [PULL,00/21] misc testing fixes for Travis and docker [PULL,01/21] docker: Use stable git tag for virglrenderer [PULL,02/21] tests: run ldconfig after installing extra software [PULL,03/21] tests: remove obsolete 'debian' dockerfile [PULL,04/21] tests: update Fedora dockerfile to use Fedora 29 [PULL,05/21] tests: update Fedora i386 cross image to Fedora 29 [PULL,06/21] tests: use in-place sed magic for enabling deb-src in travis image [PULL,07/21] travis: add whitespace between each major section & matrix entry [PULL,08/21] travis: define all the build matrix entries in one place [PULL,09/21] travis: standardize the syntax used for env variables [PULL,10/21] travis: don't clone git submodules upfront [PULL,11/21] travis: use homebrew addon for MacOSX [PULL,12/21] travis: stop redefining the script commands [PULL,13/21] travis: stop using container based envs [PULL,14/21] travis: run tests in verbose mode [PULL,15/21] travis: remove matrix settings that duplicate global settings [PULL,16/21] docker: Use a stable snapshot for Debian Sid [PULL,17/21] travis: bump to Xenial baseline [PULL,18/21] tests/docker: update our Travis image [PULL,19/21] tests/docker: remove SID_AGE test hack [PULL,20/21] tests: use g_usleep instead of rem = sleep(time) [PULL,21/21] Revert "tests: Disable qht-bench parallel test when using gprof"

Message ID

20190114150129.1013-13-alex.bennee@linaro.org

State

Accepted

Commit

9b29d0490d3f8b912d7a635004c89f9ef0a61b52

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Mon, 14 Jan 2019 15:01:20 +0000
Message-Id: <20190114150129.1013-13-alex.bennee@linaro.org>
In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org>
References: <20190114150129.1013-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 12/21] travis: stop redefining the script
	commands
Precedence: list
Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, 	qemu-devel@nongnu.org,
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

misc testing fixes for Travis and docker | expand

Commit Message

Alex Bennée Jan. 14, 2019, 3:01 p.m. UTC

From: Daniel P. Berrangé <berrange@redhat.com>


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>


-- 
2.17.1

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

[PULL,12/21] travis: stop redefining the script commands

Commit Message

Patch