From patchwork Fri Aug 3 08:52:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143390 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp222379ljj; Fri, 3 Aug 2018 01:52:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcXXARHSe4tkhQfAe/f6dcEWi+JQEgLDd4+Dovq9F+L7N9qy7LajwjPG3ay2/doN2KPzdFJ X-Received: by 2002:a1c:e54:: with SMTP id 81-v6mr4564899wmo.84.1533286355825; Fri, 03 Aug 2018 01:52:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533286355; cv=none; d=google.com; s=arc-20160816; b=Sznn1YQSaSPB6nX9DY+Z82WgIqjUhmxm1925cI0H/R3+vS6lKZpMEnaXnIG1gEySq2 u1vyP3sL6JPuTcAOUPGGSIc01A2fDr40q3XOwWVkK8hzt7nzrZzcLYgcYu6uml1hLydT kdDlYIlFi51KztefFUtUC6NQmm5AGtCTVxmD/M68ELUFRz7VV3pHXLs515r7rPeR/nDf GKSvk52yzqfYNPmLwMKzcHdbqXSsuZ4Dxn0fKlUbnky6ltYkZ65VNwVn8YiiHWF/p+1L rjSxuBWNFFTLuUex7aI20ULIxia5dv6VpGYvQtMjYhCqs4sfWVMri3TZmxxLWdaFRJ9I EnIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=hONhL7zSOgB7sRY62CoIF87aoMHarnDNV6I3xyiUTsI=; b=uk+n0KobLtR4XwcY4TfPKkrzCumBifSaVrdspk0ydw72Cp1xl0pVshaiADBb+4h9Tq y8jNBVpCaVr9Bmqja8+zU7T1IvB06InhVKXHWW5ZCG9ALLDh1JRtiapT4HTHAr+GMDnM ADd2KnNPgP4/edbi0BswQZ2hkYfLvkyACh2t220a+kfIG8A78NYTse5X0xfTNDIbA/ED GlMkfFBDF54Y9ghWTP2A7ZikLAB6fvFa5PIbIvL10UMeLk/3VM7YbwVeVx0+p9l01rgR dYTB2I2gxayjFtBMlp5fIrBSbl9BmT9dD5Mb4+gTKcVieLdk8KWH7gDni1S1dPhdOMkg lDJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id c1-v6si3283612wre.346.2018.08.03.01.52.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 01:52:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1flVp4-0006rP-Do; Fri, 03 Aug 2018 09:52:34 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/5] tests/vm: Use -cpu max rather than -cpu host Date: Fri, 3 Aug 2018 09:52:26 +0100 Message-Id: <20180803085230.30574-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803085230.30574-1-peter.maydell@linaro.org> References: <20180803085230.30574-1-peter.maydell@linaro.org> Currently attempting to run the vm-build-* tests on a system where the user does not have access to KVM will fail, because although they avoid using -enable-kvm, they use "-cpu host", which only works with KVM. Switch to "-cpu max" instead, which works with any accelerator. Signed-off-by: Peter Maydell --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 36431178161..ae9ab128c7b 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -65,7 +65,7 @@ class BaseVM(object): self._stdout = self._devnull self._args = [ \ "-nodefaults", "-m", "2G", - "-cpu", "host", + "-cpu", "max", "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22", "-device", "virtio-net-pci,netdev=vnet", "-vnc", "127.0.0.1:0,to=20", From patchwork Fri Aug 3 08:52:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143391 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp222392ljj; Fri, 3 Aug 2018 01:52:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfmjE1CZK64/mon80Bl/onzTcO0WGmKJzhoHKZAkg0mDmFoXZXdU+u0xc4lLMFeal13Y8Qt X-Received: by 2002:a2e:4d51:: with SMTP id a78-v6mr4645195ljb.106.1533286356484; Fri, 03 Aug 2018 01:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533286356; cv=none; d=google.com; s=arc-20160816; b=cWUsZzcf9aOgQamqEV/j6wWiv1Xk6yKsgjixwcdlTIYQm8pBqbV1vRj3wKCLOknzfi t9RQBC3a93VeQbZMkqCE0JZzCLAXjK1SjuBZOmcxjfsBBonDaMGzzv0wkcgwctaRlrUy 9AvN97KyBK1txtV39BczHL6M9ZHLvl9j4NkqRsIQsEHPA0XMYKkqZhc3ZevGxlm5vybE WBOLkxniRYt5+xzsn0gmlNR1YsTj9ik/bQ63jT76rjXeL9pNiIM+0G9Snkx2AC8yaanw 5pKCnZX4upDXM85lAIt25VnLbB9ci6/GRN8TRzL0q9qYlCZIKgebAm5nrhc0qY9V2iVG 8RRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=XoghprM7EwCty0fgoOTMLqk96na1ezabK/sIK58zb3s=; b=lHFOY/1vh/UTc/mpx5BzIAf4Kq916cMpE930mHREclt78I68bwSe04+xmUd1ZzI/w1 cbKrcfIKuP15H00mUKz1gTcMYvp3MjQCHFVKENLRmwRYSd4tltu3A06maqRGuizzcKII IykuD+MP0ElYhQ7uLpW2ong1NnSfVi90ZGBj9kmDYeHhZDqJ3tdurNN++Aj65yVY1PCg rGVbjsfzitBfsIKtuNdL5dXLogAGvahASJreeaZmLxtK0itYqYgM8SRlTOBabFnJdVzE jEag1QjWyoQA4E4V/lgneJC1dmFeRn8p68yao20fDCYGLxT39Z2lTj2uvBGZ/imk9zAv sS/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id y28-v6si1762112lfi.217.2018.08.03.01.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 01:52:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1flVp5-0006rc-B6; Fri, 03 Aug 2018 09:52:35 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] tests/vm: Pass the jobs parallelism setting to 'make check' Date: Fri, 3 Aug 2018 09:52:27 +0100 Message-Id: <20180803085230.30574-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803085230.30574-1-peter.maydell@linaro.org> References: <20180803085230.30574-1-peter.maydell@linaro.org> Our test suite works for parallel execution too, and this can noticeably speed up a test run; pass the 'jobs' setting to it as well as to the build proper. Signed-off-by: Peter Maydell --- tests/vm/freebsd | 2 +- tests/vm/netbsd | 2 +- tests/vm/openbsd | 2 +- tests/vm/ubuntu.i386 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 039dad8f693..2187a173274 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -24,7 +24,7 @@ class FreeBSDVM(basevm.BaseVM): tar -xf /dev/vtbd1; ./configure {configure_opts}; gmake -j{jobs}; - gmake check; + gmake -j{jobs} check; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 3972d8b45cd..2cc4798f0c4 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -24,7 +24,7 @@ class NetBSDVM(basevm.BaseVM): tar -xf /dev/rld1a; ./configure --python=python2.7 {configure_opts}; gmake -j{jobs}; - gmake check; + gmake -j{jobs} check; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 6ae16d97fdf..df6b79fe7dc 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -25,7 +25,7 @@ class OpenBSDVM(basevm.BaseVM): ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; gmake -j{jobs}; # XXX: "gmake check" seems to always hang or fail - #gmake check; + #gmake -j{jobs} check; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index fc319e0e6eb..059d295865c 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,7 @@ class UbuntuX86VM(basevm.BaseVM): tar -xf /dev/vdb; ./configure {configure_opts}; make -j{jobs}; - make check; + make -j{jobs} check; """ def _gen_cloud_init_iso(self): From patchwork Fri Aug 3 08:52:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143392 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp222396ljj; Fri, 3 Aug 2018 01:52:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfCDX7rDbnpi9UTPVxL+7WCf3uQ0/U6OzIyiABwRAawSDrFIEgvV192qyuTVk1nDYhqIKTv X-Received: by 2002:a1c:14c3:: with SMTP id 186-v6mr3982811wmu.21.1533286356816; Fri, 03 Aug 2018 01:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533286356; cv=none; d=google.com; s=arc-20160816; b=q2NOV7b8DvsZ2vVKvuTZIqKr8ruRi9s7S6AnzoKF8CGoNiXz/5p5SZKwifoWXjbTxm vgujculk5GQWMG5no05ROtIwI5duM8s4vWoQN56QRKDXa/CQB13W5tpNY2K6R7Q5DK3+ 4A166IX3K87voEV3N0DwtHgfFZGNNRu8LoSPThuvM4puO5sKj2nP4MZHxjT2PnrYvZTi g5rnVnSX0l384MVSubYnRRlDCWznqHCFFjVge+9K0BxKHzcJM8hllK6xvc28A7MAPlK4 AtIbV+CruC5jfWvUJkOkpo0Z4pz9gwR+UtD27eAzY7o2wShdnu7JjHjiDm57BcqFuEBZ 59eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=svT4xNcEDZtIwLUr8bFlHieQcNYs4X/2jJFqdiRWDCA=; b=YSwftc4i1EVuNggSUhFmoYSKA0cmXWQTvgxfImsUkGUhsQLsQvROAyGapH5EpK2pbI 2QHit/F3JReXfINOK+jopTZh0nCZTuqdnSbuGReDC0U4e7NDVNmPML60l5VVAzxXYF0/ ZilWmZM+WZhPmIkmTt9iMG6EEZsxhOdC0ghGzfI0svROlZ1e0ye8mGLEUPBgdGzhp/0y mNebZVsvpXG2ZvkiyCHz22M/JbFxUwzoyHT2ZLDJK2/zgSRDzbKVzAY1HCLpaP7+8Xn5 uEQHCYA/zxOjv6wkyJQgl2kGATYsYjxDEtYVm8IB7GfNidWDLLIletoQWI6GQ4tyTL5C h+dA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id e63-v6si3195373wme.91.2018.08.03.01.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 01:52:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1flVp6-0006rz-7q; Fri, 03 Aug 2018 09:52:36 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] tests/vm: Propagate V=1 down into the make inside the VM Date: Fri, 3 Aug 2018 09:52:28 +0100 Message-Id: <20180803085230.30574-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803085230.30574-1-peter.maydell@linaro.org> References: <20180803085230.30574-1-peter.maydell@linaro.org> Invoking 'make vm-build-freebsd' and friends with V=1 should propagate that verbosity setting down into the build run inside the VM. Make sure we do that. This brings it into line with how the container tests handle V=1. Signed-off-by: Peter Maydell --- tests/vm/Makefile.include | 1 + docs/devel/testing.rst | 1 + tests/vm/basevm.py | 5 ++++- tests/vm/freebsd | 4 ++-- tests/vm/netbsd | 4 ++-- tests/vm/openbsd | 4 ++-- tests/vm/ubuntu.i386 | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 5daa2a3b732..2efc27961df 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -36,6 +36,7 @@ vm-build-%: tests/vm/%.img $(if $(V)$(DEBUG), --debug) \ $(if $(DEBUG), --interactive) \ $(if $(J),--jobs $(J)) \ + $(if $(V),--verbose) \ --image "$<" \ --build-qemu $(SRC_PATH), \ " VM-BUILD $*") diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 5e19cd50da8..56eed22a78b 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -423,6 +423,7 @@ Debugging Add ``DEBUG=1`` and/or ``V=1`` to the make command to allow interactive debugging and verbose output. If this is not enough, see the next section. +``V=1`` will be propagated down into the make jobs in the guest. Manual invocation ----------------- diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index ae9ab128c7b..bf8b1bcfc5e 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -210,6 +210,8 @@ def parse_args(vm_name): help="force build image even if image exists") parser.add_option("--jobs", type=int, default=multiprocessing.cpu_count() / 2, help="number of virtual CPUs") + parser.add_option("--verbose", "-V", action="store_true", + help="Pass V=1 to builds within the guest") parser.add_option("--build-image", "-b", action="store_true", help="build image") parser.add_option("--build-qemu", @@ -238,7 +240,8 @@ def main(vmcls): vm.add_source_dir(args.build_qemu) cmd = [vm.BUILD_SCRIPT.format( configure_opts = " ".join(argv), - jobs=args.jobs)] + jobs=args.jobs, + verbose = "V=1" if args.verbose else "")] else: cmd = argv vm.boot(args.image + ",snapshot=on") diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 2187a173274..795f739c7b3 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -23,8 +23,8 @@ class FreeBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/vtbd1; ./configure {configure_opts}; - gmake -j{jobs}; - gmake -j{jobs} check; + gmake -j{jobs} {verbose}; + gmake -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 2cc4798f0c4..c211672bcbd 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -23,8 +23,8 @@ class NetBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rld1a; ./configure --python=python2.7 {configure_opts}; - gmake -j{jobs}; - gmake -j{jobs} check; + gmake -j{jobs} {verbose}; + gmake -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index df6b79fe7dc..1e0c2500ad9 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -23,9 +23,9 @@ class OpenBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rsd1c; ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; - gmake -j{jobs}; + gmake -j{jobs} {verbose}; # XXX: "gmake check" seems to always hang or fail - #gmake -j{jobs} check; + #gmake -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 059d295865c..7ea25327071 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,7 @@ class UbuntuX86VM(basevm.BaseVM): tar -xf /dev/vdb; ./configure {configure_opts}; make -j{jobs}; - make -j{jobs} check; + make check -j{jobs} {verbose}; """ def _gen_cloud_init_iso(self): From patchwork Fri Aug 3 08:52:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143393 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp222410ljj; Fri, 3 Aug 2018 01:52:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcbyGwMleo0L474OztgIw2gjsglNblnZKfs1Hd04sC5goyZtBUpO9CH6yjU+/gQTJSuudO1 X-Received: by 2002:adf:f9c9:: with SMTP id w9-v6mr1891699wrr.105.1533286357690; Fri, 03 Aug 2018 01:52:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533286357; cv=none; d=google.com; s=arc-20160816; b=AXRlH7L4kHW4jQIzMDPBKSHtPRvAyQ+z01XL5//FBn/hiB/5MDG08tclOjlgQ6oBmR bBX7dQzlkWjeyJ59dR/qJ5L1xQSqbGjU9ajsjndi0kPopAIZD9OekvzaaMVPTfjKJnoq xitv99YYYsTrzAUeAs3JvWYdvDHYA11RY29wrW/Xs619pgcM6n59x1n9b6v5jfLG1VzG Je/zykpANv2oa8ogzqigq15LLRaC99qGpz2teuGa/NKBZ6DEYP/R/twwN3w663qSzTvz LiWtiIeWnLpsA5JKfU/1VcxmlnphdkdQOFSj/QkiI85DRHiUkh9iuuf5sHALbbakVe1o NTcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=N4q5KCHeCC2MEW6CGWTB8n9EGT/DjE40HmzxR+0qDjQ=; b=eW5wTX2lunYMS36QjCvhygh6YkfZ2FFIfog8pPd8YlxqAG89HjmBpJQPnuByb0jVQW hR4n1sCK0+O/nYZW38PpfBvlZx1fhbetOMQoaK4Bu0yijVLwiN20R99eXn9pB2pbGc4q Rdz6zhpF4olEqI/bgrC0/yirSPR6SWtw7DYiLWFlgjQo6ZlXbdP95FF7iIbSyR+EqTW7 YJaeu5dV0lzvs+txCqkkztuiIG7bCYusprGmPXA5lR4sxt89VwYfK5M9aCTgybbaD2SS Q1NBaanhUpjRJ5ubjESCOdjatftEFnX7Ygn14tjba/vmKEtU8tVHoaHCuoElOFbxKN/s iFZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id n13-v6si2973915wmh.106.2018.08.03.01.52.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 01:52:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1flVp7-0006sc-7m; Fri, 03 Aug 2018 09:52:37 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/5] tests/vm: Bump guest RAM up from 2G to 4G Date: Fri, 3 Aug 2018 09:52:29 +0100 Message-Id: <20180803085230.30574-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803085230.30574-1-peter.maydell@linaro.org> References: <20180803085230.30574-1-peter.maydell@linaro.org> Currently we run the guests in a VM which is given only 2G of RAM. Since the guests are configured without any swap space, builds can fail because the system runs out of memory and kills the compiler, especially if the job count is set for a lot of parallelism. Bump the setting up from 2G to 4G to give us some more headroom. Signed-off-by: Peter Maydell --- Specifically I found the NetBSD build was falling over with a J=16 level of parallelism. --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index bf8b1bcfc5e..879229379d8 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -64,7 +64,7 @@ class BaseVM(object): else: self._stdout = self._devnull self._args = [ \ - "-nodefaults", "-m", "2G", + "-nodefaults", "-m", "4G", "-cpu", "max", "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22", "-device", "virtio-net-pci,netdev=vnet", From patchwork Fri Aug 3 08:52:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143394 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp222433ljj; Fri, 3 Aug 2018 01:52:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpetWz/q8npbljRxAREIQkY1QxHZyYSn2psZi4/8hUMo8NSCUzm7EpBRwyzlOt14eipglkWz X-Received: by 2002:a1c:3f45:: with SMTP id m66-v6mr4158104wma.37.1533286358728; Fri, 03 Aug 2018 01:52:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533286358; cv=none; d=google.com; s=arc-20160816; b=pGVpPmjha6mXSwCcYMK6ShZVDKFzidDJPDc1CCHtoSmP6zzYiVEUh2UZ0zxCaQl8um ee51+EYDRaeFsM/m1c7MEaHmJewcyvQuaTplswKgbIEhh0RFivZolIM7ZURXw3sR/4R+ Jofj3XOu7eJMf7Pgn0tv2K4PBMVKSNCkD4oHdxUCiIoIkS2zRKA3x1QGVu+MnKI2nHZK sdeGB7+VzO5ywZCqRBcINJCT09x66HRV8uGM6PqPKWELZ3jlUcEPY3AN7fFAs+i9Mnn5 r+CughtPiMYY2oMk0nBs4Fw6n+Z0SQy3CkSzz0GRg3mvucByPBEWeP6XKHg9FrLVXDYS ZkHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=qRv17eBYjjXgQ56iY67dnP33sDuN11KPTQzLeaBXT6o=; b=VZDMH8bwib3Kj8z2XNhZ3UdnaturS+Awemqap0I7dq5ZZBuZ+nhDlJOPtsYzIgya2k n54y547T+d7qz+HwjKMflnqb0Mr01qboAhRDJqUA/turOpUFD7FXOm83U/29ZxH0XzRj dx9Doh63oHiO65Evhm6RWDrfvo6sejbtHFJNNiYSq9Mxa6JNtCLDtSGkzsmet+U5c3Df AOBHuoBM1+CS/ljl0o6saiBPJm4gYmCbqG95BQ2r2pb3HfYkAHovvflAzi5fEjbAvAbh mUnH6AC7NnDm7wud6+LNl1fWc3tOYgc42jB9Aww8aEqhCPkZ5B3u2ONtqEfPZFdvzBiC rOIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id d99-v6si3208229wma.162.2018.08.03.01.52.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 01:52:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1flVp8-0006tC-7n; Fri, 03 Aug 2018 09:52:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 5/5] tests/vm: Use make's --output-sync option Date: Fri, 3 Aug 2018 09:52:30 +0100 Message-Id: <20180803085230.30574-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803085230.30574-1-peter.maydell@linaro.org> References: <20180803085230.30574-1-peter.maydell@linaro.org> Use make's --output-sync option when running tests inside VMs, so that if we're building with parallelization the output doesn't get scrambled. Signed-off-by: Peter Maydell --- tests/vm/freebsd | 4 ++-- tests/vm/netbsd | 4 ++-- tests/vm/openbsd | 4 ++-- tests/vm/ubuntu.i386 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 795f739c7b3..0a6ec4614a7 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -23,8 +23,8 @@ class FreeBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/vtbd1; ./configure {configure_opts}; - gmake -j{jobs} {verbose}; - gmake -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index c211672bcbd..45c9260dc0d 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -23,8 +23,8 @@ class NetBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rld1a; ./configure --python=python2.7 {configure_opts}; - gmake -j{jobs} {verbose}; - gmake -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 1e0c2500ad9..98edfbca4ba 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -23,9 +23,9 @@ class OpenBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rsd1c; ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; - gmake -j{jobs} {verbose}; + gmake --output-sync -j{jobs} {verbose}; # XXX: "gmake check" seems to always hang or fail - #gmake -j{jobs} check {verbose}; + #gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 7ea25327071..54c25d5727a 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -25,8 +25,8 @@ class UbuntuX86VM(basevm.BaseVM): sudo chmod a+r /dev/vdb; tar -xf /dev/vdb; ./configure {configure_opts}; - make -j{jobs}; - make check -j{jobs} {verbose}; + make --output-sync -j{jobs}; + make --output-sync check -j{jobs} {verbose}; """ def _gen_cloud_init_iso(self):