From patchwork Thu Jan 10 17:45:09 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: 155263 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2176477jaa; Thu, 10 Jan 2019 09:52:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN7ihDAJbmM4VY9fDhUblgO0Jk5wgukwJ+Ft83OMSRPgEasYIDDQ1rM2JZP3sRS94Dhf6VE6 X-Received: by 2002:a1c:cf0d:: with SMTP id f13mr10473367wmg.70.1547142739506; Thu, 10 Jan 2019 09:52:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547142739; cv=none; d=google.com; s=arc-20160816; b=YkscKQa1IZExILR73Aa99TCcBxmRWb6UEGtDqN9lsEbZ8d2Sk9tPjSFW/pmRu/62XO EG4BGQ+Yld++zyNPBGUhQjXN2L97zLmVRGBDBmnhVSenAmm7MawRyW3U9xKuS/zgRAXY oaHP+4SoaMrHheAFg2LPUsMIR1NyY84aX8BfvctncTQEOr6O0/UtYOdf1Ox8TiyClbMR PXg+XQqpVMVAODHo80rNA4KL3+MCEmQ17NgjOp07lKu9YEJ71RkgvAs44MCZlcwdlqRJ u6gNVcEIHqxFUC5RUq47sWmPAaYiAs/rLUEBJ0o0uapupcpjEEwU3OviUgz1g9jAomjt VWTw== 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=/MXKQg5q21wR54HpLO1tIMeW5VhlIZHwmfyJDVP9y6o=; b=WviE4ubahpwl1iKl/CSCBLBgi1rd8b7Oz3luFZwBk/d1BIVY5J7n9IghkfTs3xDCsD TExn9MmzGPUoCXH88MGQPk35b1840xxy2ZPISeoPIqyVIiqcqbXLPriJv4iuAmlagEW6 W3+Qy5DVFI/B+DsIaQIYZlhqacdOVBxbgNs8N+HUX5qync8MF0Fu+qTBUFE0gQenZUEa IKsnpYEtSrwYh6enGa+tqq6E7bqmI0JBGMMktBdKyOlmnZAhLppHyMePrgyrNdFpAA7l t1zhpDoMdk0ITZK+5wb/spCCG3Gj9PnYic/gaa6g6apvH7+DVmvRXAzD5GAnfOQLvqHc 2K5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aKXi3BJw; 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 h11si43992179wrw.18.2019.01.10.09.52.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:52:19 -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=aKXi3BJw; 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]:35268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gheV8-0001au-ER for patch@linaro.org; Thu, 10 Jan 2019 12:52:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gheOh-0004lj-9I for qemu-devel@nongnu.org; Thu, 10 Jan 2019 12:45:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gheOg-0008SR-20 for qemu-devel@nongnu.org; Thu, 10 Jan 2019 12:45:39 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:40860) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gheOf-0007oU-Pl for qemu-devel@nongnu.org; Thu, 10 Jan 2019 12:45:37 -0500 Received: by mail-wm1-x344.google.com with SMTP id f188so12873117wmf.5 for ; Thu, 10 Jan 2019 09:45:29 -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=/MXKQg5q21wR54HpLO1tIMeW5VhlIZHwmfyJDVP9y6o=; b=aKXi3BJwfBrzL6PRExQWe0Vvl2SWqITfTY8hbBy6XN/QLjScTwf7UcQd13bIh3tzse s/0HGwIsXd/yFcx6U52m3EYAyEE7P1xS0KvtURmeXhGvns+QctfOmCnCgNDoW8uBPDzO 64ztH9x7IZ+LKn9WMeBMg+WZo+oKuKZitACEU= 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=/MXKQg5q21wR54HpLO1tIMeW5VhlIZHwmfyJDVP9y6o=; b=TH6heTd6XLfX7jWA7kjKmXTy7B3yDSLkLGphh2n/9EqzOG3uziLgnILXCDl8JyTtE6 obT6ygMHMuIOuN3sltHXG1rrMmH4SGEjvO1roFqDdt9wzgzPR2+wnYBYTBX4iY4YxEgU OBISoKKTNTFGcUtaO/5SWyDr/JKdFAg440GV4e1i/eoIEz9SnsgsGDdpkArSvFR7Me1z G16ivkbaZLlKPGwksueGyHNR9/EgbQBAjoMxeV+eEmO/Ev+xBbEuGdNI0wmVKcDQ5kp8 ulagrYl6YOxF3caL61mtzGstIzQFkHpE9ddRXmd60tiwqNCa5oehjcXnld3tbqKpN8T+ jv2A== X-Gm-Message-State: AJcUukd1NIWLJ9GGk7cWIXfp2C86OkIYMRBhX0AzvBw2QLNpKQr2ndxZ sq93DpLhrSAUZoGelNV8K6ctKA== X-Received: by 2002:a1c:934b:: with SMTP id v72mr11201276wmd.5.1547142328374; Thu, 10 Jan 2019 09:45:28 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o15sm53387161wrp.12.2019.01.10.09.45.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Jan 2019 09:45:24 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E75483E0EB8; Thu, 10 Jan 2019 17:45:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 10 Jan 2019 17:45:09 +0000 Message-Id: <20190110174516.21586-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110174516.21586-1-alex.bennee@linaro.org> References: <20190110174516.21586-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::344 Subject: [Qemu-devel] [PATCH v1 12/19] 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: ymankad@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , =?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 --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 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