From nobody Wed Nov 5 08:16:24 2025 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; 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; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533286607837608.6396483113414; Fri, 3 Aug 2018 01:56:47 -0700 (PDT) Received: from localhost ([::1]:49669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flVsz-0003Da-NK for importer@patchew.org; Fri, 03 Aug 2018 04:56:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flVp9-0007w9-Kh for qemu-devel@nongnu.org; Fri, 03 Aug 2018 04:52:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flVp8-0003Yo-Gy for qemu-devel@nongnu.org; Fri, 03 Aug 2018 04:52:39 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1flVp8-0003Tb-7S for qemu-devel@nongnu.org; Fri, 03 Aug 2018 04:52:38 -0400 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 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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 3/5] tests/vm: Propagate V=1 down into the make inside the VM 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 , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Invoking 'make vm-build-freebsd' and friends with V=3D1 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=3D1. 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(-) 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 =20 Add ``DEBUG=3D1`` and/or ``V=3D1`` to the make command to allow interactive debugging and verbose output. If this is not enough, see the next section. +``V=3D1`` will be propagated down into the make jobs in the guest. =20 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=3D"force build image even if image exists") parser.add_option("--jobs", type=3Dint, default=3Dmultiprocessing.cpu_= count() / 2, help=3D"number of virtual CPUs") + parser.add_option("--verbose", "-V", action=3D"store_true", + help=3D"Pass V=3D1 to builds within the guest") parser.add_option("--build-image", "-b", action=3D"store_true", help=3D"build image") parser.add_option("--build-qemu", @@ -238,7 +240,8 @@ def main(vmcls): vm.add_source_dir(args.build_qemu) cmd =3D [vm.BUILD_SCRIPT.format( configure_opts =3D " ".join(argv), - jobs=3Dargs.jobs)] + jobs=3Dargs.jobs, + verbose =3D "V=3D1" if args.verbose else "")] else: cmd =3D argv vm.boot(args.image + ",snapshot=3Don") 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}; """ =20 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=3Dpython2.7 {configure_opts}; - gmake -j{jobs}; - gmake -j{jobs} check; + gmake -j{jobs} {verbose}; + gmake -j{jobs} check {verbose}; """ =20 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=3Dx86_64-unknown-openbsd6.1-gcc-4.9.4 --python=3D= 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}; """ =20 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}; """ =20 def _gen_cloud_init_iso(self): --=20 2.17.1