From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 23 Aug 2023 08:17:31 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qYhBM-005pXG-MV for lore@lore.pengutronix.de; Wed, 23 Aug 2023 08:17:31 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qYhBK-0001hi-Nb for lore@pengutronix.de; Wed, 23 Aug 2023 08:17:31 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IDZuN60mz7nDJid1kVOviCrS3DdYx3qcHTSQWENwrAQ=; b=TUxhZHLpBgUQQ6ebneSdo4xL14 54lMFlwkcFxIDflvWos9VQ5+ejmUPlGul8HVnJflaWsAnRwhMta2dcxEsppiRqOyfoAD5RSkHhqU9 c0g3BQQ8wCj5KOXsFtdLyjOLLWhYHAA/nqcDSWtghDxDU3AknTEE601IbbWY3juoPOaQ+FN//i9xa cbWKm8WzP5phzhDIFdMLU7oto3VID4dbKRuHGrq+uqJ+p8JPLHp0Uko6XeRpcC2OkSQ2OA4gutRXB FTy21zXSJal5hdX3f/0dHANTxpFCn3ezq28xhAKC++84MHEHmKX75K2fnzjnwnYe2Hw2WcBqa62k/ p4BCJncw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYhAE-00HNFd-02; Wed, 23 Aug 2023 06:16:22 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYhA9-00HNEb-2w for barebox@lists.infradead.org; Wed, 23 Aug 2023 06:16:19 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qYhA8-0001Yq-1V; Wed, 23 Aug 2023 08:16:16 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qYhA6-000z0H-9s; Wed, 23 Aug 2023 08:16:14 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qYhA5-00Bzdx-2o; Wed, 23 Aug 2023 08:16:13 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Wed, 23 Aug 2023 08:16:12 +0200 Message-Id: <20230823061612.2858543-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823061612.2858543-1-a.fatoum@pengutronix.de> References: <20230823061612.2858543-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230822_231617_991999_52CE49DF X-CRM114-Status: UNSURE ( 9.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/2] test: pytest: support formats besides raw for --blk X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) So far, we hardcoded format=raw to avoid Qemu warnings about having to guess file type. Instead move format=raw to the start, so other formats can be appended as necessary. Example: pytest --lg-env test/arm/multi_v8_defconfig.yaml --interactive --blk=img.qcow2,format=qcow2 Signed-off-by: Ahmad Fatoum --- test/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conftest.py b/test/conftest.py index 03bf41a93874..12daf3a058ff 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -89,7 +89,7 @@ def strategy(request, target, pytestconfig): for i, blk in enumerate(pytestconfig.option.qemu_block): if virtio: strategy.append_qemu_args( - "-drive", f"if=none,file={blk},format=raw,id=hd{i}", + "-drive", f"if=none,format=raw,id=hd{i},file={blk}", "-device", f"virtio-blk-{virtio},drive=hd{i}" ) else: -- 2.39.2