From patchwork Mon Jan 14 15:01:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 155524 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3763500jaa; Mon, 14 Jan 2019 07:10:55 -0800 (PST) X-Google-Smtp-Source: ALg8bN69fvCvrOCLcsbP1npY2zZ6TjkDfqhzobeGfEVrV7kx8NcLUNbdnRMpyOdAbswmuzIpG5N0 X-Received: by 2002:a1c:3905:: with SMTP id g5mr11882916wma.30.1547478655622; Mon, 14 Jan 2019 07:10:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547478655; cv=none; d=google.com; s=arc-20160816; b=TgPukoGEGxyCGMzREh2Zm3jFD3Ip5V01oXQfO+d8gsctrKNUumJcBFxdRC1EmAD9WN kSi2B2NZS2IwTHee+b5CCnvCzB18C9Qb8FdDLImZMDFLNdo4rDsaNHFEbP6qKY6KwNwm FWbO7/ekFfCD+I7JFmz5wq4MBUMF2Z0k8cH9QAYAVUfXaEhh8L8uAxBVAImy47hHJH/m dDSIxpHU3uTuAp94yEyIl5wdrxNBu+UPL1ksIO0XOHxHbr/9V4KBOmrkXnExhimXJMMh 7s0xpDhe7z+XB4lrIb5MYfReNe0D4XENLEBFqL7wHFtAC01xyHTa6I6ispW7NN1IX5lZ XwNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=6yfe1i9POvvD9eR3DdDpidndCBbnuE1App/Jbb8vFWQ=; b=c6PEMAOKyHsxUwD2qeTXRXEJz61XsyQi1MfLpTZ9brKvZNp8wvazR7FYXRThokG5H4 fVGjBUqo37hDuzkxQVbGV4Cws8sEWk7WLfy/cdLtnm7Jlw/BPGSFd9o2DaH50IHuCeL3 oo/V2yO2oud5Rl5IZU0vrvv9e7RlJvBFa1U9dGUZfIGaHMG3EokO4+qFtz/TvWwVQBUc riAoj+V3niom8pCdv7aKxqiQ83nwTCApYyeFXB/gA9jVLortaDp8czrwg1HPB96Z7IMX SnelltUsrGU7IpeT2czZmTv+1jwrUuNHLELHNrxkTvS9I7UQWbs8HbvenNT3q8M2iMVl LmqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXo+aSNX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k3si47385287wrm.213.2019.01.14.07.10.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 Jan 2019 07:10:55 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXo+aSNX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:49490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3t8-0007Ao-Hq for patch@linaro.org; Mon, 14 Jan 2019 10:10:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kC-0006Go-NV for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kB-0005L6-U8 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:40 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kB-0005KZ-Nj for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:39 -0500 Received: by mail-wr1-x434.google.com with SMTP id v13so23223283wrw.5 for ; Mon, 14 Jan 2019 07:01:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6yfe1i9POvvD9eR3DdDpidndCBbnuE1App/Jbb8vFWQ=; b=dXo+aSNXac/JbKaYrg0ncgEgaJbbuyX2t6MdNel/I+PmrScLItcEObsJTekFVWLlWk 56qwoBxkk5u3SLG6C6z61deziTB1xHQUzN2hZHspau0wFrYDristvRdhfI6eq16GbGtr 88D2oeqQ48UYFaX/FiC3rTNuV7YoVDb4+hWcw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6yfe1i9POvvD9eR3DdDpidndCBbnuE1App/Jbb8vFWQ=; b=m6jQULFlZJ7Ea8OquYEAYp1wF7ju9aE5kheEaZ4lNHBuom9qzYASd/Jv7OF5cdIbLm u5PaOEHnRFO3/5Y5+9J0TKmjgSdh45AbRrUCPuNhUiE1i2VJ2f/S/vYf9sTzBR5WK8Pz 7zRpMx6gyhoTNY+wKaWyt3zBM+6uthTSiLJvpvhypRGVIIbZzhjiA/E80VUOLPY+94FO L6uSEEfWriak7rH2+PZWRRZtPww5MKd1RCVJLkOM0bARJg2kxi9l2I6R5dRAPv3r1/vV r2ratRRII3OfEUanXn1O6LwCYpwEuDRgl+Mf8bBbwiDJsubHsZ3bhQ4FjiVkWebTG9Di dXxA== X-Gm-Message-State: AJcUukdOP3K3PEolOBiUsZSBR1WCpAv5bsnF22JVc4aQrwRDqH3InR8J FijPq0YagQMno/I6PCf1i13xLQ== X-Received: by 2002:adf:e9d1:: with SMTP id l17mr23200510wrn.73.1547478098630; Mon, 14 Jan 2019 07:01:38 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 129sm46295478wmd.18.2019.01.14.07.01.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:36 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CF6873E1185; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:20 +0000 Message-Id: <20190114150129.1013-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 12/21] travis: stop redefining the script commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Signed-off-by: Alex Bennée -- 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