From patchwork Mon Jan 21 17:15:42 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: 156222 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6620002jaa; Mon, 21 Jan 2019 09:26:05 -0800 (PST) X-Google-Smtp-Source: ALg8bN5ULLJp2uDBh5fz/cF7wCx/diGYOcDywbBhT5EPyne/jLHFJlNT7yOP0OIj6M/+OcBc4Rnc X-Received: by 2002:a1c:5656:: with SMTP id k83mr267366wmb.125.1548091565423; Mon, 21 Jan 2019 09:26:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548091565; cv=none; d=google.com; s=arc-20160816; b=IRYl3SqVKFhWj3FE0h/zTXAv/a4ESUwb7tsJcbrs5Rf/uNUFs3jGFcFtc9xJ3/EaO4 fSf2/vdFjSTGZebVAJ5lPD0mDXesVcDR8eDbT2ADNe+TMdMyO0Ldu29PsaCGuJZJNAnU mhKETGCm5Or1DhCMUAvLi6eXIpTnhkk3t9HR1Y3FsdkdJMLSJn+BY7JowxxJjazg4cTx pvxnaClnJW8zN7LpMpErHkKA+h/UWpLEHtKrQKmOdnx2rmSWIGZ79a2Y47gMVQIwAKGp iZ++ucnehdUgmwyezyk1OUGwRxjLZBz4GGjrIidtTPI+QMjBeuP2ww+uhO8KN3Yc9ngU 3uIQ== 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=+UXEMuQd/ZRu7xyn00aaD+agdcIZdSMq/S+pRjhjd0g=; b=gAj2kOF1F/NU1hsM1zA0HjZapmWaYiP4TsXbS4m+zTDDV9KPRXyV5ueZ+dX1PC2snO lAb5O/IdsRPR3telcXqzVihfU8J7jLYzjZKqXiLtFGRJmi6lQ8gDwrUNWrbp4PBMvrzW wqz2cpgvlZhhGiAd/IJ6AwyPJjQJ1E3PAyMiJsvQKoVm+UykylpUyojH8SSkQGn+yFur RhzW7s8EWFAfcXyfo/qFiCbSZDrZRve69BoYsE4LKzA/mCVCiSUBD0MeWOcTsWAF9fRW mBZBuWiJmXi+X+CUT56/jr1MCPOVnpP0MhC+yN9oDN0RU980+B2J3v4rpC6romGNx04g bolA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MDYzdiC4; 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 x18si48519938wrg.339.2019.01.21.09.26.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 21 Jan 2019 09:26:05 -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=MDYzdiC4; 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]:56805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldKm-0003fX-A1 for patch@linaro.org; Mon, 21 Jan 2019 12:26:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldAq-0005S7-OY for qemu-devel@nongnu.org; Mon, 21 Jan 2019 12:15:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldAq-0002sy-1o for qemu-devel@nongnu.org; Mon, 21 Jan 2019 12:15:48 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:35269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldAp-0002sF-SH for qemu-devel@nongnu.org; Mon, 21 Jan 2019 12:15:47 -0500 Received: by mail-wm1-x344.google.com with SMTP id t200so11651878wmt.0 for ; Mon, 21 Jan 2019 09:15:47 -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=+UXEMuQd/ZRu7xyn00aaD+agdcIZdSMq/S+pRjhjd0g=; b=MDYzdiC4avhu06b7UXG2n0AGVwaeEUS8SsLyj1DcxuKTR86CWAhXQP3zAp5ppiPjE6 vfj9sTHLp4VrwXPckrNDBFO3vbVawuLznZNglWoOrQQWWW8v9S724FgvBtfALm5AK4/M jcVSMd9tQLwUz9BiI/fpA1R25zML0QwtVxOSs= 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=+UXEMuQd/ZRu7xyn00aaD+agdcIZdSMq/S+pRjhjd0g=; b=C4QZSY2NyXzZ/Nn9n/RLfRtrETRAts/SayCvQYE8eC2rp9WEOCiMtYs4S0fvmDYy3Q lFFLKTKv5rbAqAh7nGYC35oLaFNVhebBj49ZYTkXlYG2huOAyLXSBjXTPW9dUcM7jO72 xoZtlbjD5mjvV0MthyJApihd2o/oGgYEht09JbHXMjr1abXwpQ2+SMHpTrDiGxvc1ybc Xyb7745SNeKQfwAaVoa9LSmry0QBQxUjhlJrYZBwf9X3EPY79llp32DioadWJl1C0fjQ JEcsqHCM+jVnHz7ckDg+Fk6TrOE9k82x0wLG44n6paZ0k1Nzy1HkAAdvpHNJHHblTG+L KlSw== X-Gm-Message-State: AJcUukec9fXQnLRK64599P4Y3nG7sT1Fg4bIjwkfTyHf8cr3MiODSL3h yWfieNBDPKnHGyFFgfrm0//0BYPY5v0= X-Received: by 2002:a1c:1b8d:: with SMTP id b135mr242999wmb.115.1548090946696; Mon, 21 Jan 2019 09:15:46 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h131sm69855677wmd.17.2019.01.21.09.15.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jan 2019 09:15:45 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E30443E0625; Mon, 21 Jan 2019 17:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 17:15:42 +0000 Message-Id: <20190121171543.32422-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190121171543.32422-1-alex.bennee@linaro.org> References: <20190121171543.32422-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::344 Subject: [Qemu-devel] [RFC PATCH 2/3] 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?= , kamil@netbsd.org, =?utf-8?q?Alex_Benn=C3=A9e?= , brad@comstyle.com 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 | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) -- 2.17.1 Reviewed-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 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):