From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXGR7-0000WG-FC for qemu-devel@nongnu.org; Mon, 17 Jul 2017 20:32:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXGR5-0004n4-Qk for qemu-devel@nongnu.org; Mon, 17 Jul 2017 20:32:25 -0400 Received: from mail-qt0-x231.google.com ([2607:f8b0:400d:c0d::231]:33085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXGR5-0004mk-Ma for qemu-devel@nongnu.org; Mon, 17 Jul 2017 20:32:23 -0400 Received: by mail-qt0-x231.google.com with SMTP id n42so4450357qtn.0 for ; Mon, 17 Jul 2017 17:32:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 17 Jul 2017 21:31:29 -0300 Message-Id: <20170718003159.10200-2-f4bug@amsat.org> In-Reply-To: <20170718003159.10200-1-f4bug@amsat.org> References: <20170717144848.11793-1-alex.bennee@linaro.org> <20170718003159.10200-1-f4bug@amsat.org> Subject: [Qemu-devel] [PATCH v2 01/31] docker: allow customizing Travis global_env variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng , Peter Maydell Cc: Paolo Bonzini , qemu-devel@nongnu.org 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 --- tests/docker/travis.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"]) -- 2.13.2