From patchwork Mon Jul 17 14:48:26 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: 107971 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp4658358obm; Mon, 17 Jul 2017 07:51:02 -0700 (PDT) X-Received: by 10.200.51.172 with SMTP id c41mr29964458qtb.71.1500303062018; Mon, 17 Jul 2017 07:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500303062; cv=none; d=google.com; s=arc-20160816; b=vWLVN6HWTySjEco+S0LqY5T+zKI9I66XlSObE8Ytz+E8dQuH2xIYWmy94M7zeLVZcT uNQhzIA39/4x8tsMnaGLyGAxiENFwYzSETIJ5hnBSC0TsbluOzbI896FFpEfA5HA9xx+ u+7hR+MVlDoPe8ggkzFXUs1s251EsBNUYXTQum6jksXOj0YVPL/vJVCMXmKs6bXBaXrI qNwyLGG1NcSh6lGPDD0r8d+qSw69cMSyYVSmVwSey2NhbZ6i0SP4P71ky/M9bNbNCWcP fFPcm5PN0zIO4ABF0PiMXkRvpajGK5DBdep6DMNFopJL2GJbITQY0WM8buVX/qB/FjcZ b6qg== 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=AUgR8xMPvxYmEcaUuS2hErG1CMpYPmVVd4KwYEvWwCo=; b=JfWBTF16W5wFeoR5Z9PHefNLrUYMGettZNp360nNQHrpsakB56LDPQdDnDlHdlFG2n 9REmNnhnMoY7Ly/1E4SIkGawvlTNFkRD3RW4/JdNeiV7eFU7TtaQlCkUHOFymV5L5yQo 0ZoXXYzcRa/2nbjH3lM8cFmHyiGqkXSUUtyJHus92Ju9XWWKl8ooECpJeKVLz3HR0rL1 g3P8DnXuJ1gUuqyLEL6NEnUK4QX9dvbZbClXZzxw7wOO3i+uONEE38kjncYDi04ylaLA XkAjpl5WbaWKUMA0iAG6h9xEJYyNNO8u+yLpL6H2GhEnIaJZgvfXSiRPbh3axqgVGrrj Pvvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=iyB3YvOv; 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 w7si6148579qte.192.2017.07.17.07.51.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Jul 2017 07:51:02 -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=iyB3YvOv; 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]:50845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX7MR-0007Ex-AC for patch@linaro.org; Mon, 17 Jul 2017 10:50:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX7KT-0005ru-5s for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:48:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX7KS-00024p-A2 for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:48:57 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:35557) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX7KS-00024E-3J for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:48:56 -0400 Received: by mail-wm0-x22b.google.com with SMTP id w126so78416068wme.0 for ; Mon, 17 Jul 2017 07:48:55 -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=AUgR8xMPvxYmEcaUuS2hErG1CMpYPmVVd4KwYEvWwCo=; b=iyB3YvOvdF8I4dBlN91l6FN41BY6lEYSyCK7/ZFCDwzqHPc3C2nhseUDtM8XnJkqQ0 QX7Iu/asckPAU3kGYqkjsOFpNnQzowVav08P58nIUgeFYicQFk7qysEJLaD1JEf1P7Wc tjpR6A7lYhLEhEu/ZHoXtoiM1blF1+a7bh0pM= 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=AUgR8xMPvxYmEcaUuS2hErG1CMpYPmVVd4KwYEvWwCo=; b=qPcnQpDOCtA7uGWT6FkuJ1hzU57s9JBYzY0IeEJFOhdIm7wSrXrRv+HYt/vN56Mst3 LZJDX9D2u8PhAsnJI2IgvX4WzcPCPCHyc2JH6ji1AkMQlpUo3r2WRbvlHmCwB2tawoPU uh9jVoF0yJBdOubOzWGTnFpPK8FsT1v3gr10JNmaWfq6Dw2ye5VxMG+mot/64062c8n/ /6ib0xXTGjqFV15CKWlGFsPnyKED7xGYd6yst5eUP7uwW8oYgDFujNVHP8rmgCaGXXiQ placyYE1L7drsX75Gt9TG2Yfz3pIKxaEWc55GaHzMRK9kfmPz5Z3xkINvl6riXSM2EJC oyHA== X-Gm-Message-State: AIVw1125qtqBxM3/6qLCAzVMYvd66OPS6FMUXPYvwEKSiTISMoZphHaj 9UGCiCH0n0HCtPf4 X-Received: by 10.28.225.5 with SMTP id y5mr4946942wmg.18.1500302934877; Mon, 17 Jul 2017 07:48:54 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k23sm1902239wre.1.2017.07.17.07.48.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 07:48:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 68DE63E014F; Mon, 17 Jul 2017 15:48:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 17 Jul 2017 15:48:26 +0100 Message-Id: <20170717144848.11793-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170717144848.11793-1-alex.bennee@linaro.org> References: <20170717144848.11793-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:c09::22b Subject: [Qemu-devel] [PATCH v1 01/23] 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?= , 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: 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 --- tests/docker/travis.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 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"])