From patchwork Wed Jul 1 13:56:26 2020 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: 192161 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp533130ilg; Wed, 1 Jul 2020 07:14:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz42joxTo869Nvr2TldDytidNaN2GCXZZf3YrjgC5jGIZqAguAJyqN5BYQrA94iIrXPoqyP X-Received: by 2002:a25:d6c1:: with SMTP id n184mr41795279ybg.303.1593612848572; Wed, 01 Jul 2020 07:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593612848; cv=none; d=google.com; s=arc-20160816; b=CpcKX/48U73KdHRrBEbSxOQODAvViybDFN26c1Gc7N3d9C2xPRwktOmAfvoPl21gPk MJ6fmcQ7be44IpBF624aJaNTz6qYmjQHziG25MQQxsczDUiCx5tsGBL9ipr/JB+I0Vnz FtAOSToLDUaHzbaAVQNOfba7K3VGJ3DLX3m/xUDGDqa9K3efvUk9owSZQfByRlvzvWT9 jLZ/O8wcwDNp4vWZaNpc1xfjm95yi/8BeYSB9nelB5789JcSWEbKWD7FQ7BEy+XDe0kI MoZL24RCAcg+vRFi8ebYdmkfd8fpCw033oTTcQKvwytbOlSQOES1y/Tx5bnKiwc1zPtQ OSzw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=sygc/Hw6fwtICc5dsEJZsfgG0asRPmeTFs6oktvnw3o=; b=i/OOsSWvxFQr1vpRcs0Ap1WR9kKF6VN1+Vcf11I6gnV3lO4HnQ9rm8CRBQlkOBZlCy UJEfOk2pTDn2MuECJ84oGG51HCB8nxtQBsUd7EG3updsvBNI2S6llAPdazKqHA2Pfzh7 wZLR+sfUrr/8K4w/KcbzpXnYbyjr8AEtsU7sOD/+Eoi7hiGAvBVvBIstiC7tr+wQvaPV 9h1DOYnNr428QhIh6agueWmw3fa/IpqVLB2lqP5uf07lSdJsTKpmNIz4jdODVEDpZFcG 92jDU+nRlGTljuOY5R0CuDfGKGE5VY42kfeyIMufvPomzAyYga7QTRPK4w3IUszY0LsZ JShw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hEJKumSL; 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 m64si5879635ybm.304.2020.07.01.07.14.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 07:14:08 -0700 (PDT) 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=hEJKumSL; 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 ([::1]:38686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdV2-0005zp-0W for patch@linaro.org; Wed, 01 Jul 2020 10:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKs-0004r1-HR for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:38 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKq-0006pU-8k for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:38 -0400 Received: by mail-wr1-x441.google.com with SMTP id f18so15926434wrs.0 for ; Wed, 01 Jul 2020 07:03:35 -0700 (PDT) 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=sygc/Hw6fwtICc5dsEJZsfgG0asRPmeTFs6oktvnw3o=; b=hEJKumSL8s1zcrxYe9HpeFavd7BSWgdHT+xUxjaQPDp+YEHfPGS5bTXzUBJ2K1Ai4d kwLS9hGuTxeY9lEdifXJFBK6PSgswQ/AABLcsVwRIAwUlzaw6wRhoX7LNSuR0DDzbJSj YyeDVBeMtqIxYubyoQQDyxmtKdJ2TbU6lzudjWtzG1wJh2OeAXuecIUVfdrcQDTTzPdq uTlfqyMrFM2+nJinEdWkkpIa20wbRu9wNeIm30rqIv9lLpmPd9wPfhRaaRhp/AF4HQXu 9rJLtvBfPY+p0oGr+DZqUcKsNaMx64EMkUNOAtCr2ByKxDVIjSLZeIkIGoWbpT4AiXMs jLRQ== 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=sygc/Hw6fwtICc5dsEJZsfgG0asRPmeTFs6oktvnw3o=; b=SxcZ+rFgTPPDOKgdCPvqR7S4+O8F77UvYXFWF1WUOgkDlBcd1sz7XzX6yPqpM0vDxm HZkB2saadJT22lR/c1av/qjG/GxeD9uOfMgHx/8M1a5kjJjYp72qIFxM6td2BcgcqH/Q OTgPYUUw0aek9kAQuiilBsEdYkYvyZny70qRmLlnYWt2XNcIwLhL7pvYctpKW0gFqY9G VzHuzSzUnNTSVtpp9D9GMgcrD3brDMC2wd+jQOeYIRjm0h+kDJpJP9cwjYTCy1gTzmSQ dqMcwKnO0lbkFfSe4rfksalGLYuB9iV2Dvx/I7ec4zhhpfNYEg0UAH0rUl9o86G2HLcM j4hQ== X-Gm-Message-State: AOAM530Q54Qbw5IWNCToJYja8jJuzr1ye6Q8wXW6S2HL8+CSkLzAc0KG eCorZYxN9/0HXwL7JXQc/pXu5g== X-Received: by 2002:a5d:444e:: with SMTP id x14mr25745822wrr.279.1593612214789; Wed, 01 Jul 2020 07:03:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g195sm7530342wme.38.2020.07.01.07.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FA641FF9D; Wed, 1 Jul 2020 14:56:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 14/40] tests/vm: switch from optsparse to argparse Date: Wed, 1 Jul 2020 14:56:26 +0100 Message-Id: <20200701135652.1366-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" optparse has been deprecated since version 3.2 and argparse is the blessed replacement. Take the opportunity to enhance our help output showing defaults when called. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Reviewed-by: Robert Foley --- v2 - add explicit parser.add_argument("commands", nargs="*") v4 - fixup call to parse_args in aarch64vm.py --- tests/vm/aarch64vm.py | 2 +- tests/vm/basevm.py | 93 ++++++++++++++++++++++--------------------- 2 files changed, 49 insertions(+), 46 deletions(-) -- 2.20.1 diff --git a/tests/vm/aarch64vm.py b/tests/vm/aarch64vm.py index bb04cb19c91..d70ab843b6b 100644 --- a/tests/vm/aarch64vm.py +++ b/tests/vm/aarch64vm.py @@ -46,7 +46,7 @@ def get_config_defaults(vmcls, default_config): def aarch_get_config_defaults(vmcls): """Set the defaults for current version of QEMU.""" config = CURRENT_CONFIG - args, argv = basevm.parse_args(vmcls) + args = basevm.parse_args(vmcls) qemu_path = basevm.get_qemu_path(vmcls.arch, args.build_path) qemu_version = basevm.get_qemu_version(qemu_path) if qemu_version < QEMU_AARCH64_MIN_VERSION: diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 04d083409a5..890bbc5549a 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -23,7 +23,7 @@ from qemu.accel import kvm_available from qemu.machine import QEMUMachine import subprocess import hashlib -import optparse +import argparse import atexit import tempfile import shutil @@ -556,54 +556,57 @@ def parse_args(vmcls): else: return 1 - parser = optparse.OptionParser( - description="VM test utility. Exit codes: " - "0 = success, " - "1 = command line error, " - "2 = environment initialization failed, " - "3 = test command failed") - parser.add_option("--debug", "-D", action="store_true", - help="enable debug output") - parser.add_option("--image", "-i", default="%s.img" % vmcls.name, - help="image file name") - parser.add_option("--force", "-f", action="store_true", - help="force build image even if image exists") - parser.add_option("--jobs", type=int, default=get_default_jobs(), - help="number of virtual CPUs") - parser.add_option("--verbose", "-V", action="store_true", - help="Pass V=1 to builds within the guest") - parser.add_option("--build-image", "-b", action="store_true", - 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("--build-path", default=None, - help="Path of build directory, "\ - "for using build tree QEMU binary. ") - parser.add_option("--interactive", "-I", action="store_true", - help="Interactively run command") - parser.add_option("--snapshot", "-s", action="store_true", - help="run tests with a snapshot") - parser.add_option("--genisoimage", default="genisoimage", - help="iso imaging tool") - parser.add_option("--config", "-c", default=None, - help="Provide config yaml for configuration. "\ - "See config_example.yaml for example.") - parser.add_option("--efi-aarch64", - default="/usr/share/qemu-efi-aarch64/QEMU_EFI.fd", - help="Path to efi image for aarch64 VMs.") - parser.add_option("--log-console", action="store_true", - help="Log console to file.") - parser.disable_interspersed_args() + parser = argparse.ArgumentParser( + formatter_class=argparse.ArgumentDefaultsHelpFormatter, + description="Utility for provisioning VMs and running builds", + epilog="""Remaining arguments are passed to the command. + Exit codes: 0 = success, 1 = command line error, + 2 = environment initialization failed, + 3 = test command failed""") + parser.add_argument("--debug", "-D", action="store_true", + help="enable debug output") + parser.add_argument("--image", "-i", default="%s.img" % vmcls.name, + help="image file name") + parser.add_argument("--force", "-f", action="store_true", + help="force build image even if image exists") + parser.add_argument("--jobs", type=int, default=get_default_jobs(), + help="number of virtual CPUs") + parser.add_argument("--verbose", "-V", action="store_true", + help="Pass V=1 to builds within the guest") + parser.add_argument("--build-image", "-b", action="store_true", + help="build image") + parser.add_argument("--build-qemu", + help="build QEMU from source in guest") + parser.add_argument("--build-target", + help="QEMU build target", default="check") + parser.add_argument("--build-path", default=None, + help="Path of build directory, "\ + "for using build tree QEMU binary. ") + parser.add_argument("--interactive", "-I", action="store_true", + help="Interactively run command") + parser.add_argument("--snapshot", "-s", action="store_true", + help="run tests with a snapshot") + parser.add_argument("--genisoimage", default="genisoimage", + help="iso imaging tool") + parser.add_argument("--config", "-c", default=None, + help="Provide config yaml for configuration. "\ + "See config_example.yaml for example.") + parser.add_argument("--efi-aarch64", + default="/usr/share/qemu-efi-aarch64/QEMU_EFI.fd", + help="Path to efi image for aarch64 VMs.") + parser.add_argument("--log-console", action="store_true", + help="Log console to file.") + parser.add_argument("commands", nargs="*", help="""Remaining + commands after -- are passed to command inside the VM""") + return parser.parse_args() def main(vmcls, config=None): try: if config == None: config = {} - args, argv = parse_args(vmcls) - if not argv and not args.build_qemu and not args.build_image: + args = parse_args(vmcls) + if not args.commands and not args.build_qemu and not args.build_image: print("Nothing to do?") return 1 config = parse_config(config, args) @@ -619,12 +622,12 @@ def main(vmcls, config=None): if args.build_qemu: vm.add_source_dir(args.build_qemu) cmd = [vm.BUILD_SCRIPT.format( - configure_opts = " ".join(argv), + configure_opts = " ".join(args.commands), jobs=int(args.jobs), target=args.build_target, verbose = "V=1" if args.verbose else "")] else: - cmd = argv + cmd = args.commands img = args.image if args.snapshot: img += ",snapshot=on"