From patchwork Tue Jul 18 10:44:42 2017 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: 108076 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp5728219obm; Tue, 18 Jul 2017 03:47:27 -0700 (PDT) X-Received: by 10.200.49.230 with SMTP id i35mr294376qte.113.1500374847003; Tue, 18 Jul 2017 03:47:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500374846; cv=none; d=google.com; s=arc-20160816; b=QpJtMZ3irNigbtc0PJhvBJq2lkOSdzHkPyIbmW0F8Bi7pWhvuyCuCfW0LiMdbnbDeG w9NQfL3XyiBygFicId1PBWD2Ej3dGEQjJABuJ5NCwb/xCe2RSRxUquMuDfOL//QmTQll K7g71G9ywRUTfXBvnon9PcQ0ore99pNX55dgDRwvMwsKFuN4bBMELo2EAlpWXNphdpA+ +8bgHsg5XJpCT8oLFY2Ga2e8WzfMnykTxITVhtmpoILdLmgBxd5q7e7J16D+nEmE++49 R/mEps915hIrFVWO/uwm7+pveKr0lGWmv9KEEioyPT7husCg9ivdXbSR+zn4NZdCjmoB vY9g== 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:arc-authentication-results; bh=FrF0P2NjBRxMsvRxklO9UvAQBYrQJil7yIKJw8IIVSA=; b=R51eE/b0YMoyP3p4uOAabntFQihhKI7qU4eh7cuHpCJOZwiRXTw2+W0Lf+fHxBccl/ l26h+pDXsWcV7qaRBGoUbwtHoq9BCGIGzZI0EvDaaePOkRld/RCkYjbd5BOQsmStDLVg 8qc6DigAZ7Lvp0H8SfM9wj5iFLi1mVHR0Cj8WPatM8gFrPUPiF0KFx1n/FsW0rZd0LvA dox50EfcjrHlF4IXXvatg/9dFy7CpXmwUYXT+Y5KA0iyKM0oGFvYH/u2DVxmw4m5N/7z u55m864lQ+h8+xrCeKYugbM6+pdkg4Ozhrlt9tZ25S24ARL2VCCZuIQ9GxZ2bTdnojZI YVmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=MzktK4D1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 63si1866977qkk.13.2017.07.18.03.47.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 18 Jul 2017 03:47:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.b=MzktK4D1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:55375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXQ2G-00009B-Bl for patch@linaro.org; Tue, 18 Jul 2017 06:47:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXQ0I-0007Q9-NY for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXQ0F-00035K-Mu for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:22 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:33693) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXQ0F-00034Y-Ga for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:19 -0400 Received: by mail-wr0-x230.google.com with SMTP id a10so23430529wrd.0 for ; Tue, 18 Jul 2017 03:45:17 -0700 (PDT) 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=FrF0P2NjBRxMsvRxklO9UvAQBYrQJil7yIKJw8IIVSA=; b=MzktK4D14gvrNpT1hTmhl7I2jFf7INfs84nzJtn4ZxLwIAFd4EqgU24lix5Sbu0xuF 12eM7iH8D9jROS4SvJlruvluBa7VUtXsvHi91Ii6JvMdhXx7kwqbdEKpoRaLLBh6EeNx DGkfsv5V4BQxcyQofOVumi3E81lARCFjNNUAg= 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=FrF0P2NjBRxMsvRxklO9UvAQBYrQJil7yIKJw8IIVSA=; b=Vw6jdVmMDbjaqh6fbv7fK+xLGi+qI8a24qcntgBgVNzKn/m8OaBSL1NJbu3pnHvhYr 3FilIHSZsDJbNC4A4k45unQF4hTHxT4ItSDAuuBgqFnVZ8EC6AzJ3RE2fGWVC2pYv19T Cv7uCjeLfDTfV7h/tQ+k2JT1tJt/KjpKNwE8S3uRqtFLzplqA+MDiPWHhBNqWUg5YPLb an7Tv8LaKsdoIurccDYfE5gLxx0Zv+NLYcvQMr4Zk8Cha10H9GbPrRC9xMOx33Djxs7y 5k6wh7ny0J2r9MVSXA4cQUBc6vwkTQJpr9/brKamIveCEznlHXdG7KHNTsnCy2KPT4Xs dFKw== X-Gm-Message-State: AIVw110rkr9T7/sfNeUglhrkEPqq3dUw2ladKDae9HhDNY098HiWsuae AKhygFurfz6Xrdjs X-Received: by 10.28.7.19 with SMTP id 19mr1195364wmh.23.1500374716810; Tue, 18 Jul 2017 03:45:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n8sm724896wrn.59.2017.07.18.03.45.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 03:45:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0B8523E033B; Tue, 18 Jul 2017 11:45:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 18 Jul 2017 11:44:42 +0100 Message-Id: <20170718104513.23947-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170718104513.23947-1-alex.bennee@linaro.org> References: <20170718104513.23947-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:400c:c0c::230 Subject: [Qemu-devel] [PULL 01/32] docker: allow customizing Travis global_env variables 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 , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini This is useful so that we can do builds at higher than -j3 when running travis.py locally. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée -- 2.13.0 diff --git a/tests/docker/travis.py b/tests/docker/travis.py index 8dcc964da4..703a7fde85 100755 --- a/tests/docker/travis.py +++ b/tests/docker/travis.py @@ -21,13 +21,12 @@ def load_yaml(fname): def conf_iter(conf): def env_to_list(env): return env if isinstance(env, list) else [env] - global_env = conf["env"]["global"] for entry in conf["matrix"]["include"]: - yield {"env": global_env + env_to_list(entry["env"]), + yield {"env": env_to_list(entry["env"]), "compiler": entry["compiler"]} for entry in itertools.product(conf["compiler"], conf["env"]["matrix"]): - yield {"env": global_env + env_to_list(entry[1]), + yield {"env": env_to_list(entry[1]), "compiler": entry[0]} def main(): @@ -35,6 +34,7 @@ def main(): sys.stderr.write("Usage: %s \n" % sys.argv[0]) return 1 conf = load_yaml(sys.argv[1]) + print "\n".join((": ${%s}" % var for var in conf["env"]["global"])) for config in conf_iter(conf): print "(" print "\n".join(config["env"])