From patchwork Mon Feb 11 13:05:03 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: 158005 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2594670jaa; Mon, 11 Feb 2019 05:24:03 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib82DjSEnVCOpCdo+AUiDnJxgbSiQE2X9Z03FW0ugbPt/i7SyyJQq4dkfQso7sSZzMUEygl X-Received: by 2002:adf:f60d:: with SMTP id t13mr3903698wrp.225.1549891443161; Mon, 11 Feb 2019 05:24:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549891443; cv=none; d=google.com; s=arc-20160816; b=rxM+ATUe/ci19h9h3h/D0yLnJSbjhqas74NHHZeT+rWL/yX7weYT4AQIoXDkUHdO71 tFswbdiqCLGq+MaXfh3HcGcEGhv4tyap5Ma7yITx3LWvLKPIWrGA3Tc5M1/xwnwupYtq 1+uTcr2HhGtkYBYzlvRMQBIBKAaExFyQSGGvmBOxtrXKxyiGOI+CQaoKMtiGwd8EIv7p wECdE1C6gh7tbFVyMi+k3R/ElRvxaiG9W16gEBcALb1JUpImnylNFZ8DxsCjRpbYYl8D wsCAhfyXl5xin6aPukjibDAG00MJ7y7hD26juDqukVtCknqqmmo0+dZfNkz9RQzIIT8K N86A== 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=BOJIJj/cmWiIVTwMN8xEqo2TSIwXOH3IlTuxHWOcZXs=; b=nuVW7CI3m2PrDMUvp/dtfPElafFeLpspR1P0ZGTM1ypGUnwUobdqjEdETeT1Ht3A+o AO6D6hapHxdy+cKT/43Lu3fZ6rFyflv4As3QVJT00Eo999Ijri5/p4cs3f9Wyf1cpDbF LBLruHprx58cDY0LbOpAYjF6jj2jaXcL/n8DYYfk0IsN9G+jv+lQveI47NfG2A0+uhsY zM6xY1YE1JIqPRAr6viuBnOV0qCTLj+HTiVq7ahzwsP3ZFWXAkzMGos25USWteR08vT9 rQROdVhYHeidb58aDlHtlGyALf5OaTda7EK7CMrjXj+gJwH4hwwLTzmfOaYnRu/RyAg/ 4wEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UCtx3UUD; 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 o18si7164661wrq.380.2019.02.11.05.24.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Feb 2019 05:24:03 -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=UCtx3UUD; 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]:50182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBZ4-0003JP-5p for patch@linaro.org; Mon, 11 Feb 2019 08:24:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOX-0004YG-SS for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBOV-000099-GF for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:09 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:40919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBOU-00007f-BS for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:06 -0500 Received: by mail-wm1-x341.google.com with SMTP id q21so17181214wmc.5 for ; Mon, 11 Feb 2019 05:13:05 -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=BOJIJj/cmWiIVTwMN8xEqo2TSIwXOH3IlTuxHWOcZXs=; b=UCtx3UUD55z8cijO1ngiFfRBa3wonrsDFxZndYi57g/Z1q4bdXDoHsqauIElX2DX+1 gZu180/trvWr7cDASmccugbpStUx9WG12j9iFnyMegcMjS1p7q7gKVOk0cnICSM/ba7o /UltFGcNrtTXgSlxTrBqEuro8X98cOI3u4sdZnXczBlLzR7dqRDigvIs2EOM5Eikdzxa ro2a1v9xfL3kklQCmMBI0nbDcY5bVFftjl6W1jHaiwdoBBHJekBE7yEw0fSJ3ijhk0Ym L6D82LButdAMyhBsAqUGEhEbZ8ws4Q5uQ1By/+7Q6A3vggGajk9WCaKQtHMl29Ca2CGl seUg== 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=BOJIJj/cmWiIVTwMN8xEqo2TSIwXOH3IlTuxHWOcZXs=; b=pMpJ9z0dmMI5YMFITbFm/+bj4odkuAlJmQvBvpykAaU728+zwFZXnrysB27vCYkhxU oLrhYs0pc8adRIB2kitwAa21lr98Upq4D1mqYEQze/EHFSieal02z5rR2efuH2dHFee5 zSrCKmXKBbWaXLlyZ6yVdtthzV/Oj/YTtucBaHX0FHNyDzsyDghfqZu7wl9s4sMdqsX6 wcBb3SzKczkkiu2tlDF8Qn7RSG6RiEc6sz6kEomZYmpzh73KsOg73gmzuhAg7wmD53EU xUup0UCpFNV/1eEX3iQchyVfRuLYSUSRw1xQdWVkmxEJG/e5sl9QTrShhCcVkHS2sjRg I1yg== X-Gm-Message-State: AHQUAuZ3wZGFfvQzoz7rXBrbFCiG+Rg/8cWjSRutnBWGe1Pd0HiL3vUT BIrCgK/aW7DrISgxp1xiMFWCTw== X-Received: by 2002:a1c:c303:: with SMTP id t3mr8466287wmf.94.1549890784056; Mon, 11 Feb 2019 05:13:04 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c129sm10808259wma.48.2019.02.11.05.13.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:13:03 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B69D21FF8E; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:03 +0000 Message-Id: <20190211130507.8710-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-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::341 Subject: [Qemu-devel] [PULL 14/18] 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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):