From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:41574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gliSz-0005sa-GX for qemu-devel@nongnu.org; Mon, 21 Jan 2019 17:54:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gliSy-0007K7-2X for qemu-devel@nongnu.org; Mon, 21 Jan 2019 17:54:53 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44837) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gliSx-0007GX-PM for qemu-devel@nongnu.org; Mon, 21 Jan 2019 17:54:51 -0500 Received: by mail-wr1-f67.google.com with SMTP id z5so25192912wrt.11 for ; Mon, 21 Jan 2019 14:54:46 -0800 (PST) References: <20190121171543.32422-1-alex.bennee@linaro.org> <20190121171543.32422-3-alex.bennee@linaro.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <7fdded47-e3df-4a36-aeca-76f05c470395@redhat.com> Date: Mon, 21 Jan 2019 23:54:43 +0100 MIME-Version: 1.0 In-Reply-To: <20190121171543.32422-3-alex.bennee@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [RFC PATCH 2/3] tests/vm: add --build-target option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Alex_Benn=c3=a9e?= , qemu-devel@nongnu.org Cc: kamil@netbsd.org, brad@comstyle.com, Fam Zheng On 1/21/19 6:15 PM, Alex Bennée wrote: > This allows us to invoke the build with a custom target (for the VMs > that use the {target} format string specifier). Currently OpenBSD is > still hardwired due to problems running check > > Signed-off-by: Alex Bennée > --- > tests/vm/basevm.py | 3 +++ > tests/vm/freebsd | 2 +- > tests/vm/netbsd | 3 +-- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 5caf77d6b8..bdca6cb2fc 100755 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -228,6 +228,8 @@ def parse_args(vmcls): > help="build image") > parser.add_option("--build-qemu", > help="build QEMU from source in guest") > + parser.add_option("--build-target", > + help="QEMU build target", default="check") > parser.add_option("--interactive", "-I", action="store_true", > help="Interactively run command") > parser.add_option("--snapshot", "-s", action="store_true", > @@ -255,6 +257,7 @@ def main(vmcls): > cmd = [vm.BUILD_SCRIPT.format( > configure_opts = " ".join(argv), > jobs=args.jobs, > + target=args.build_target, > verbose = "V=1" if args.verbose else "")] > else: > cmd = argv > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > index a85c866c30..1d64c31b7c 100755 > --- a/tests/vm/freebsd > +++ b/tests/vm/freebsd > @@ -25,7 +25,7 @@ class FreeBSDVM(basevm.BaseVM): > cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); > tar -xf /dev/vtbd1; > ./configure {configure_opts}; > - gmake --output-sync -j{jobs} check {verbose}; > + gmake --output-sync -j{jobs} {target} {verbose}; > """ > > def build_image(self, img): > diff --git a/tests/vm/netbsd b/tests/vm/netbsd > index fac6a7ce51..a2c3d13af4 100755 > --- a/tests/vm/netbsd > +++ b/tests/vm/netbsd > @@ -25,8 +25,7 @@ class NetBSDVM(basevm.BaseVM): > cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); > tar -xf /dev/rld1a; > ./configure --python=python2.7 {configure_opts}; > - gmake --output-sync -j{jobs} {verbose}; > - gmake --output-sync -j{jobs} check {verbose}; > + gmake --output-sync -j{jobs} {target} {verbose}; > """ > > def build_image(self, img): > Reviewed-by: Philippe Mathieu-Daudé