From nobody Sun May 5 03:15:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500024985543324.19763259536444; Fri, 14 Jul 2017 02:36:25 -0700 (PDT) Received: from localhost ([::1]:36507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVx0n-0002o7-Lu for importer@patchew.org; Fri, 14 Jul 2017 05:35:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVwzI-0001Hy-Hs for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:34:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVwzG-0005Hk-FV for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:34:16 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36303) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVwzG-0005HM-8o for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:34:14 -0400 Received: by mail-wr0-x243.google.com with SMTP id 77so11258900wrb.3 for ; Fri, 14 Jul 2017 02:34:14 -0700 (PDT) Received: from localhost.localdomain (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id u135sm1732484wmu.12.2017.07.14.02.34.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jul 2017 02:34:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=nY8Dd7W5tskaUnz26OFqW8eWWMMcXxldpC1ASaNOl5c=; b=TNSs1qw5o8LFiJFxpinGytHLnhRPKZbH/+lWwc3ybdNWAx7hkgcFudg05Nz2JJEEhO miiWoTjyBQPT8p6fXa7bcsjK17NrTR5y1BNOjv1U1lTD7MJK5T84xvUDLbE7WWA3s95o 0nPhrT80KEbmA8fOEBa3PQA2sRhNfQQ2enqZRdyEKsN6ljvrPHHLzXeMaKS4LbSoQFEh zp1Z5okd8WsjLgQYLLYyWTiUI+Pv2GHuTLD6/QW4MQ/ZHWh4kmb0C1Fs1886Ra7Vdzel TzI+rTDLYnWKY7ZP35Bagb0uwD7ieqIUGjPuSaf7kfB2gby8Z1FkIbRAL5XzZqZcsIa6 16QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=nY8Dd7W5tskaUnz26OFqW8eWWMMcXxldpC1ASaNOl5c=; b=kP5+8gJV4EQ+K59HdfdX0k4jFO8mvsIys3UpIiI5y0cuy6rh8+RrAlkLRh27SoQc+0 LQm6LsNMbYO+oLG8kz5PI3KiKitiWrFPbWFVgteR/D9gvtiCUCGcinOehZjfZUMGYHTv sPS/Ygb/aDg5DpDHZ/A8YJQUKubgxY50k7ZvuK9tXuqb/31fclnQ0G+A2fkZrkmMswQ7 8r9jF7uVx7gmFjvIt/oF311Q+SeRKVsfhA7NvrrPF6/VwrR6YuoTf5lOUvLhQgWjyGLk Bt3lfv3I4wbVxdRMUhYnhQt/0eJT8cfjbQwm2fDniYw9EXue7usV2myNndhxiFfocPU/ r0GQ== X-Gm-Message-State: AIVw110rF2rw2aJ+42gV+w+4M1FrpZKu57x2OLCTF/kuho/Ft+EHKRtW Hnlhv+CtKjYdbiS9PNY= X-Received: by 10.223.178.143 with SMTP id g15mr3999394wrd.144.1500024853071; Fri, 14 Jul 2017 02:34:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 11:34:06 +0200 Message-Id: <20170714093407.11526-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170714093407.11526-1-pbonzini@redhat.com> References: <20170714093407.11526-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH 1/2] 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: famz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D 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]} =20 def main(): @@ -35,6 +34,7 @@ def main(): sys.stderr.write("Usage: %s \n" % sys.argv[0]) return 1 conf =3D 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"]) --=20 2.13.0 From nobody Sun May 5 03:15:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500024984021690.1271668105014; Fri, 14 Jul 2017 02:36:24 -0700 (PDT) Received: from localhost ([::1]:36505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVx0n-0002nL-13 for importer@patchew.org; Fri, 14 Jul 2017 05:35:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVwzI-0001Hx-HJ for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:34:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVwzH-0005IE-MJ for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:34:16 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVwzH-0005Hs-Fc for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:34:15 -0400 Received: by mail-wm0-x244.google.com with SMTP id y5so9776119wmh.3 for ; Fri, 14 Jul 2017 02:34:15 -0700 (PDT) Received: from localhost.localdomain (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id u135sm1732484wmu.12.2017.07.14.02.34.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jul 2017 02:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GQCUblorStIknXKtQg1e8ccg4CeFO4WNUxN3hYciq6U=; b=t6bBK5RsgXNc4hjticcqnQPSc1+Wq3+IN54zAaBJsh4M5goYux1aW6aVCEqqSkYQDO UQfDbalt4gU2QhHVqICpGd0WjIPqc+Op8PbjazHaEoXnj7YFlZxWwJa2rWoDwSJRFCDc G2B1+uOXHyDqv+Ak+643RlhqauWakhJD+Z/yCKveaGAq4fba5G2Ol4udBMBl2FgTEWGi JFMsQ417cL62Im24aigag0ZrEvEDMdJ7QRS+1Zr8kK0+/46hwUIUIhLImakoQ6jI45IT cUldfep+/qjvLwFrDm0HjJ4sEAT8A8+x4hfP3EltegIievBJyC5MlmUF6x7qwMN+/uUT b0XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GQCUblorStIknXKtQg1e8ccg4CeFO4WNUxN3hYciq6U=; b=OWarKVv6J0o5E2AlW9VQoeMHBJFKL+pjk1pxc/CN2tM0gC4ARhnhKPEksDi+OmS+Jj jyRm0p4H4yvNjZKlDk/2ZJ+5xKqi3KJYBEGtscrdFoFsIM9tiq7JJFns2HSAMFVTIeMq JNhmWr+5/QUPo0TIdVHaI9GvoFKZO/B/yGRYuRkTXRZ5fWELigGZjo5D7PHzX7V1GV9f aULLcG8YJTJwX5WSLgPnxB5x/IDRrePPHNSVE278MOYX0qxtubA7YiRbFYV50f15JIB0 OoNtqSu9HEznRX59/1t3SHfXLHJR61YLavniO2ivmNeowCO8d76pp3JWry397cwkGvx9 hLFQ== X-Gm-Message-State: AIVw110CzXgsoVMHMpsWJ5fx/BlqqD7thEqKYv9KkhEGQhZaussmi5M6 l3LhoTQknFatZdaxj+Y= X-Received: by 10.28.57.197 with SMTP id g188mr1921111wma.13.1500024854212; Fri, 14 Jul 2017 02:34:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 11:34:07 +0200 Message-Id: <20170714093407.11526-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170714093407.11526-1-pbonzini@redhat.com> References: <20170714093407.11526-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 2/2] travis: move make -j flag out of script 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: famz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Because global environment variables can be overridden when .travis.yml is processed by the docker-travis target, the effect of this patch is that docker-travis now obeys the "J=3Dn" option. Signed-off-by: Paolo Bonzini --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27a2d9cfb3..6809e25eca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ notifications: env: global: - TEST_CMD=3D"make check" + - MAKEFLAGS=3D"-j3" matrix: - CONFIG=3D"" - CONFIG=3D"--enable-debug --enable-debug-tcg --enable-trace-backends= =3Dlog" @@ -64,7 +65,7 @@ before_install: before_script: - ./configure ${CONFIG} script: - - make -j3 && ${TEST_CMD} + - make ${MAKEFLAGS} && ${TEST_CMD} matrix: include: # Test with CLang for compile portability --=20 2.13.0