From patchwork Fri Jan 25 14:00:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 156580 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp395926jaa; Fri, 25 Jan 2019 06:04:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN76SeMwWxk5BoF8d49jrGJ3MwryHotnZmxHoaRzEJgB0yb/SzQ4lSPevlGJ2fuDBrDoVWyk X-Received: by 2002:a5d:6b09:: with SMTP id v9mr12200801wrw.304.1548425057948; Fri, 25 Jan 2019 06:04:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548425057; cv=none; d=google.com; s=arc-20160816; b=mZqnJIUV7PPg8pWFt2zFlvECBUcpbcIB/4rTrxrZODnkNHOW02+U5VwIm9pQETYome HPZ3F8HuTx5Q4CnyqziYKgRGr3EfCqwDOqPpn36rAO3xZWSvmQIFhz3Ci+RYHvwNK13o iq7iq6BUJ2LmcuOkBzkUhVBfsW8xTDWzyGN0slC0yp3sXa0f1GNxlnKRgRCk+kyTzgwx JeSai68UuQNgc4x004p8ukObZisT8dkrcJLSxJaZ+68UnRsDZbaDLVSnVOyYeVA9QlrK Sjqh+tBSwj/q/cl2x++cc2TAygZTvN8zkyhZk09uQzXiQSOFvrcqJbyKwJm9lajkfAXF 9E7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=t6Sf3/Lq8RpGv2iUNl9eak/++G7pqN9J7pUEqjfdrpE=; b=ugbBrmsi7eR6tJk6ZMrbUGSo9lJlt739yG46hi7sTbag5FO0McO+sphhKl+PZxsNCt Gp2BCcZAWWKNHVJlCis/W9ahzQFfV0xciF6kJ2SHPE83OYfdPKAfEyTGm9m9Yhh5IEjt 5NTRaTFXc2A2F2UPI9UGA5EhZ8QCUouEjeK+wz9IrDOTEY7iye3qKhJ+7jpfiVsz0F0E qeH6D52IgvCXLssG3eDbefylv06s5t6VMfCJL5+asxlatbgEtShNRndothyyzR5Pm+E4 IuiU1mMcSDU9hCq6f/Vdg47E7gSh1Cb7dtkky6drxOSOLD9IjXgyvotUZxnBnm0TTyGR dDig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iNjNthCI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r4si3497309wmc.200.2019.01.25.06.04.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Jan 2019 06:04:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iNjNthCI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:45176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn25h-00064v-0B for patch@linaro.org; Fri, 25 Jan 2019 09:04:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn22A-0003c7-6u for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn225-0000kZ-FF for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:37 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:51583) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gn224-0000fu-Jv for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:33 -0500 Received: by mail-wm1-x32d.google.com with SMTP id b11so6892410wmj.1 for ; Fri, 25 Jan 2019 06:00:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t6Sf3/Lq8RpGv2iUNl9eak/++G7pqN9J7pUEqjfdrpE=; b=iNjNthCIZ/iQ3kCaFEQUGHZwULNGzEQKPTjIP2egLfnO1pLGKRZnbnXBZ1wbfZSciD b6bRdkHlReSLYnBXIhfgO0CuD/h/zAe7Y3nxtQDTwtN6gXvWlq0KQe9PBA5OSARjd3PK WZIS+WVRo6gx2JW3GhzLg45HhSX35clPKeT6c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t6Sf3/Lq8RpGv2iUNl9eak/++G7pqN9J7pUEqjfdrpE=; b=eisz3H1YTGxoCGTGJwhauXhWD9VVVUg110or/TgpcefN+GkUXpN0dM5uBNqG1gRmJ+ uFeWciJchzSrTcwlcYFTc+72N2021N1CAx2l+TFNP8nOs7kOYxZLSVGPW/I6f2Flfpv3 HqooIYjtpRGuQ62Q14WyRqs9SU9WgILohtL8ICfUqnPjQuc42qwmnqn8Hx/LOU2gzRZL Nvpm7HP2PmpEJrAmKC3K48codjzK3l+obNkHXi5N47jjomvCQOF2s5mCWuD7LMEvA40q 5WbmLzpt7JXo+ED4HC3e6TQoTim83Ixp5fMFeUA1aVnEx/PPA7CRsYG+x7twclNv75PY IykQ== X-Gm-Message-State: AJcUukfpCUmN3EqoxfDwXBwF6sAd4iluuf1LDWRKBNWXbfV/TEl3UAyL Dqd+2scjwdwnGjDfi1KxBpVH5w== X-Received: by 2002:a1c:e18a:: with SMTP id y132mr7463324wmg.48.1548424829208; Fri, 25 Jan 2019 06:00:29 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x3sm102334965wrd.19.2019.01.25.06.00.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Jan 2019 06:00:24 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 99E503E09EB; Fri, 25 Jan 2019 14:00:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 14:00:15 +0000 Message-Id: <20190125140017.6092-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125140017.6092-1-alex.bennee@linaro.org> References: <20190125140017.6092-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d Subject: [Qemu-devel] [PATCH v1 12/14] tests/vm: add --build-target option 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?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 | 2 +- tests/vm/ubuntu.i386 | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 edea113bb5..a2c3d13af4 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -25,7 +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} check {verbose}; + gmake --output-sync -j{jobs} {target} {verbose}; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 252e514859..a22d137e76 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,7 @@ class UbuntuX86VM(basevm.BaseVM): sudo chmod a+r /dev/vdb; tar -xf /dev/vdb; ./configure {configure_opts}; - make --output-sync check -j{jobs} {verbose}; + make --output-sync {target} -j{jobs} {verbose}; """ def _gen_cloud_init_iso(self):