From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250505; cv=none; d=zohomail.com; s=zohoarc; b=jaWqom0u33US/DrEZpKyVkfv3L3ruzzTR0fRIkCSO3WSQ295WV7OgwnSQsGyxLT+ViXeX4A51KlyPqvsAjlDwKdYlQUe3ofw9PYZeqMDXa0ZFgFgZ6cwiDxPlxjXSLOqBC8ZndfYX+KLE6WGIDjHbKYDvIDHC3ET5NgNuQKqlPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250505; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=F/XVk7xO79WM0xuiBN1O3UY9ZGNz+SEwPoexHQYxLpg=; b=mQ9FQj4VTZHaEBk3nSrV0JtF+hkTfje2LU6XTnVvyXMXnXeJ0zAaoI+6v7PUgZNp/VXFWOkvL4hcXdCdovNcENkDmoLosTGQqczgbWj6VpJ4YCMdM/cmfWtTO/ATyfekTZizVMw+6N1dv7BdT/ejXi6Vq5ACvQrrJXNvLk/rTKs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250505601254.93894883688415; Mon, 12 Jan 2026 12:41:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOiQ-00075o-NK; Mon, 12 Jan 2026 15:40:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiP-00075Q-Kf for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiO-0000kM-5v for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:41 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-jlPobdMLMuWDoF-AfXue0g-1; Mon, 12 Jan 2026 15:40:35 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3F53A18005B7; Mon, 12 Jan 2026 20:40:34 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C1D630001A2; Mon, 12 Jan 2026 20:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F/XVk7xO79WM0xuiBN1O3UY9ZGNz+SEwPoexHQYxLpg=; b=Y/DZIe82oWmTh5BWad3VCjIUnhMgLdV5F7he5sHf39FBEJHfadzmTU8Ynt0/B0xziQ9QoS ffVwtlAHamdRnWzgGcyJWc0TTEjGSG2H5VzSzlATKeO21S01nd8FLqaaL0r+iDKaCUuRvj D6a78xJu+5CL6RFnfUieAldX3kjT3j4= X-MC-Unique: jlPobdMLMuWDoF-AfXue0g-1 X-Mimecast-MFC-AGG-ID: jlPobdMLMuWDoF-AfXue0g_1768250434 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 01/13] Revert "python/aqmp: fix send_fd_scm for python 3.6.x" Date: Mon, 12 Jan 2026 20:40:14 +0000 Message-ID: <20260112204026.710659-2-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250507404158500 This reverts commit a57cb3e23d5ac918a69d0aab918470ff0b429ff9. The current code now only requires compatibility with Python 3.8 or later. The conditional usage of 'sendmsg' on the async IO socket wrapper will generate a deprecation warning on stderr every time send_fd_scm is used with older Python versions. This has the effect of breaking the QEMU I/O tests when run on Python versions before the 'sendmsg' wrapper was removed. Unconditionally accessing 'sock._sock' ensures we never use the asyncio socket wrapper, and thus never risk triggering deprecation warnings on any Python version Most notably this fixes the QEMU block I/O tests on CentOS Stream9 that use "sendmsg" for FD passing, which otherwise generate deprecation messages breaking the expected output comparison. Signed-off-by: Daniel P. Berrang=C3=A9 Acked-by: John Snow Reviewed-by: Thomas Huth --- python/qemu/qmp/qmp_client.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/python/qemu/qmp/qmp_client.py b/python/qemu/qmp/qmp_client.py index 8beccfe29d..7a115b693b 100644 --- a/python/qemu/qmp/qmp_client.py +++ b/python/qemu/qmp/qmp_client.py @@ -720,12 +720,9 @@ def send_fd_scm(self, fd: int) -> None: if sock.family !=3D socket.AF_UNIX: raise QMPError("Sending file descriptors requires a UNIX socke= t.") =20 - if not hasattr(sock, 'sendmsg'): - # We need to void the warranty sticker. - # Access to sendmsg is scheduled for removal in Python 3.11. - # Find the real backing socket to use it anyway. - sock =3D sock._sock # pylint: disable=3Dprotected-access - + # Void the warranty sticker. + # Access to sendmsg in asyncio is scheduled for removal in Python = 3.11. + sock =3D sock._sock # pylint: disable=3Dprotected-access sock.sendmsg( [b' '], [(socket.SOL_SOCKET, socket.SCM_RIGHTS, struct.pack('@i', fd))] --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250522; cv=none; d=zohomail.com; s=zohoarc; b=GaD3tcdsf0I+wjT9BxbkfAvdrWLUNSCrhxbUCroiCkqsA0KKgDyyBGGsJRObaW7/AjLQLqvffIHxAv+Mv8+7znyPxJ+P5AAppHbWi80aJ1IcN6uCAEzV/+NehwF2racp8tOY7kC58c1qdQWL+lDjQ7BFaFmJe7M+OLz8Bp2ujy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250522; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vntM9tGb991FfbG3dFd4aFaD0bnLAsf5o3B1BjcLiks=; b=GgdGIUJUZlHlewwrj2fldsnrORhognMMIcJ0wLMmzk0TCZCR8Edqrqpf+NsjcVBxOB/yRQ+PFMQ+08CGPRm5bFS2HmCZPUW4HLB+A6hVOyBz/Lj8272ur5pt1RUHybAypNRIF5TioYTMbFW4541j7rTU+lSxfUw93BVhXilJJ+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250522537723.1487566300086; Mon, 12 Jan 2026 12:42:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOiU-00078k-1E; Mon, 12 Jan 2026 15:40:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiS-00077q-U5 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiR-0000lF-FR for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:44 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-317-pEdnKOU5PmOXKdwFAmBbng-1; Mon, 12 Jan 2026 15:40:38 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 542DC180035D; Mon, 12 Jan 2026 20:40:37 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 81DCA30001A2; Mon, 12 Jan 2026 20:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vntM9tGb991FfbG3dFd4aFaD0bnLAsf5o3B1BjcLiks=; b=Nl6x9eEwMwgcdhzx6sLV8NLUgB1aMn7Pxb3MgQBloKjAJPScCQ3JP1o7nzEH8e7P72/ZPO Ocau27nt43BjWlA9V7X42sGr+ejKcwEuHvgAU0+kp658CVB6DIZwA6z9oDmLa58iTMRRoA hWnvo6XMEVj6FPImDT750FiUE5C1BxU= X-MC-Unique: pEdnKOU5PmOXKdwFAmBbng-1 X-Mimecast-MFC-AGG-ID: pEdnKOU5PmOXKdwFAmBbng_1768250437 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 02/13] tests: print reason when I/O test is skipped in TAP mode Date: Mon, 12 Jan 2026 20:40:15 +0000 Message-ID: <20260112204026.710659-3-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250523467158500 The TAP output on a skipped test: ok raw 181 # SKIP is not informative. The test program included a reason, and that should be displayed in TAP mode (it is already shown in non-TAP mode): ok raw 181 # SKIP Postcopy is not supported Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/testrunner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index e2a3658994..dbe2dddc32 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -174,7 +174,7 @@ def test_print_one_line(self, test: str, elif status =3D=3D 'fail': print(f'not ok {self.env.imgfmt} {test}') elif status =3D=3D 'not run': - print(f'ok {self.env.imgfmt} {test} # SKIP') + print(f'ok {self.env.imgfmt} {test} # SKIP {description}') return =20 if lasttime: --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250522; cv=none; d=zohomail.com; s=zohoarc; b=jd6LL+mF8t3HECEq54NI1vsjp0dZ0SXzK2VH+QmDITBi50IQSv47ZTRySXQLTC/O3buVqaOenKY4MJIC/UiFYHJMDq7OEmX7OVABsHRkzk7NNGvhJ43PnjNN6QqhpwPF1xakJmxsZlPMWoGOZLzcAZnam36UJJSsxACIf4R0EoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250522; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JaMS0Ug4nb7lySlGdylNTav+617VFuvlpo/Vye5QDAA=; b=I0BaomJZZ4FGQqtQXQX2qbj7luR6cvHNeH2kBxJfIIG9vvZcU/Xoii3H3Wp0auB5S6h79k0PUvsKNTNBlbIybMjvISo7oblnjqArovCFS43/u5M38qncaIX4EBF+p98hKTi8klWJRl8+MmrI/02PrK5vQSZJ7OF3OQQd02Y2XG0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250522427409.65962516925254; Mon, 12 Jan 2026 12:42:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOiV-00079F-6B; Mon, 12 Jan 2026 15:40:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiT-00078J-9h for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiR-0000lJ-Rw for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:45 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-335-oza0rmKQPTCrAs1sjZj8UA-1; Mon, 12 Jan 2026 15:40:41 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AB4BB195605B; Mon, 12 Jan 2026 20:40:40 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A8BD230001A2; Mon, 12 Jan 2026 20:40:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JaMS0Ug4nb7lySlGdylNTav+617VFuvlpo/Vye5QDAA=; b=ATnlj+mJxeCwOWbKIpQfli/W7JfP0Gx9B1WyjVi/IHvi+OKBrt60V9+OZp4KFXLIcLcfjs alg1dOZUt3gWUhgYwpCh06BDKw2oi4sozMWkt3w/wg5PcMAdDVF87VhUye9OS4LBJ2HTHz gMrPntZQgiQJE6VF2C0X/H8xjsrKv1g= X-MC-Unique: oza0rmKQPTCrAs1sjZj8UA-1 X-Mimecast-MFC-AGG-ID: oza0rmKQPTCrAs1sjZj8UA_1768250440 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 03/13] tests: remove redundant meson suite for iotests Date: Mon, 12 Jan 2026 20:40:16 +0000 Message-ID: <20260112204026.710659-4-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250523465158500 If a test is in the 'block-slow' or 'block-thorough' suite, there is no need to also add it to the 'slow' or 'thorough' suites. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Thomas Huth --- tests/qemu-iotests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index d7bae71ced..bf588cc2c9 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -33,7 +33,7 @@ foreach format, speed: qemu_iotests_formats if speed =3D=3D 'quick' suites =3D 'block' else - suites =3D ['block-' + speed, speed] + suites =3D ['block-' + speed] endif =20 args =3D ['-tap', '-' + format] --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250498; cv=none; d=zohomail.com; s=zohoarc; b=duHU7l1x2OfbYJmSfLs48wrjZjKty25v+etGxOCfzU+YI3uLVZtnW2fQ8UfUCCbDVVWVgJgK559dcAs6kyytcXtjfYUItYFWJNIOnNblDU25MYY5geurFfcuOPyaRf3/g7UQa6FEFqxdewp15tFFqMIcYacC1VQVmmE4/aIi4lQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250498; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YHbWsxnLcKlcxDgbOvHYUNhvHUb8wzkl1Sh6JEd+IUw=; b=JdJjKrB1equyKW0wcfhe+ht6zuDd5f86dHMNnjzTfRp7mALhjACuG0ybANMPBVQRSMF/KPrFk+YUK6kRUGknr8i24ju4TqMKIvSHoVep23sb2TJd0GLMMtsnvq/RaT+ynQi8Sc1FdQwPZxl1FdlInNxvQjEQ5KoIDyn+SQECB3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250498629315.03824337928836; Mon, 12 Jan 2026 12:41:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOiZ-0007B0-SH; Mon, 12 Jan 2026 15:40:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiY-0007AC-Qq for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiX-0000mA-Cs for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:50 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-298-cdJjDtSOO_aije83yVpDjQ-1; Mon, 12 Jan 2026 15:40:45 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1C8CA1956050; Mon, 12 Jan 2026 20:40:44 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 11A7830001A2; Mon, 12 Jan 2026 20:40:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YHbWsxnLcKlcxDgbOvHYUNhvHUb8wzkl1Sh6JEd+IUw=; b=Kp5oxsM8t2cxM2N1nG8Arky2jwsZ76KQ5pbe2BtkuMjx9mPv+7h16YQyw8lBKUvSnKiN+E r4dVPOpxlIx/I0N1QPiRsYrFI743fE71tzRgjkjdw7nqYU6FAIMea+uZeDSQYPa7GgWLL+ ufwpYf1jj3DfNPFvGSyJTJAdc4+scHs= X-MC-Unique: cdJjDtSOO_aije83yVpDjQ-1 X-Mimecast-MFC-AGG-ID: cdJjDtSOO_aije83yVpDjQ_1768250444 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 04/13] tests: ensure all qcow2 I/O tests are able to be run via make Date: Mon, 12 Jan 2026 20:40:17 +0000 Message-ID: <20260112204026.710659-5-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250501861158500 For block formats marked as 'quick', only tests in the 'auto' group are added to the meson test suite. The result of this is that qcow2 tests not in the 'auto' group cannot be run at all, even if passing SPEED=3Dslow or SPEED=3Dthorough. To fix this we need todo two passes over the I/O test list. First add all tests from 'auto' group into the 'block' suite, so they are run by default. Then on the second pass add any tests which were not in 'auto' into the 'block-slow' suite, so they get run when SPEED=3Dslow or SPEED=3Dthorough. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- tests/qemu-iotests/meson.build | 48 ++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index bf588cc2c9..1a24d801a3 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -30,16 +30,48 @@ endforeach qemu_iotests_check_cmd =3D files('check') =20 foreach format, speed: qemu_iotests_formats + # Formats tagged 'quick' get the subset of tests in the 'auto' + # group, run by default with 'make check' / 'make check-block' + seen =3D [] if speed =3D=3D 'quick' - suites =3D 'block' + args =3D ['-tap', '-' + format, '-g', 'auto'] + suites =3D ['block'] + + rc =3D run_command( + [python, qemu_iotests_check_cmd] + args + ['-n'], + check: true, + ) + + foreach item: rc.stdout().strip().split() + seen +=3D item + args =3D [qemu_iotests_check_cmd, + '-tap', '-' + format, item, + '--source-dir', meson.current_source_dir(), + '--build-dir', meson.current_build_dir()] + # Some individual tests take as long as 45 seconds + # Bump the timeout to 3 minutes for some headroom + # on slow machines to minimize spurious failures + test('io-' + format + '-' + item, + python, + args: args, + depends: qemu_iotests_binaries, + env: qemu_iotests_env, + protocol: 'tap', + timeout: 180, + suite: suites) + endforeach + endif + + suites =3D [] + # Any format tagged quick or slow also gets added to slow + # otherwise its tagged thorough + if speed !=3D 'thorough' + suites +=3D ['block-slow'] else - suites =3D ['block-' + speed] + suites +=3D ['block-thorough'] endif =20 args =3D ['-tap', '-' + format] - if speed =3D=3D 'quick' - args +=3D ['-g', 'auto'] - endif =20 rc =3D run_command( [python, qemu_iotests_check_cmd] + args + ['-n'], @@ -47,6 +79,12 @@ foreach format, speed: qemu_iotests_formats ) =20 foreach item: rc.stdout().strip().split() + # Skip any tests already added from the 'auto' group + # as they're run in the 'quick' suite already + if item in seen + continue + endif + args =3D [qemu_iotests_check_cmd, '-tap', '-' + format, item, '--source-dir', meson.current_source_dir(), --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250624; cv=none; d=zohomail.com; s=zohoarc; b=SvkgSmLgTbsinMlnUtaq+2qIrg6Bi7wxMCI0RLtznK54iHxWcHWDR7Lw0cDJesO5DICSkxMi/dsCb2pPg5XwBri+dqx3HdooXtJCTbbzvmUASTlfNzHY0xqSiOwAGJU3l14uqkkA41ratMNDsl1KNsjxVStBLUtnY6Zh1NFcjek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250624; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=moAwrK2n49hXREt/lA9q3TgfKecTSkokmei1vTgzCO4=; b=MwNkCbPssRI9cjIaFXVs4RBCWV0Ib0DAJnkoGY9RNwChCDzliB9BiX/22fdiEDkbn7XE8Doab3NBhmgrB/Q/hObeqZ5Au6E+CZf0R1RvVDSqjhjrmQss7Sr0ZeqoTB9uMCrYVrCpCqcAHpl2ByZJ4Tqm4SuCaR8zZpMe+NHWWaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250624140865.8226149724538; Mon, 12 Jan 2026 12:43:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOie-0007DZ-KZ; Mon, 12 Jan 2026 15:40:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOid-0007Ch-20 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOib-0000mc-KC for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:54 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-339-slRKtakaO1G0OhtJkbOVCA-1; Mon, 12 Jan 2026 15:40:48 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 76CB41956096; Mon, 12 Jan 2026 20:40:47 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8A47C30001A2; Mon, 12 Jan 2026 20:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=moAwrK2n49hXREt/lA9q3TgfKecTSkokmei1vTgzCO4=; b=eeVAFjmxpcu1u2cDvbFW68rpIh9GpoXeobxJ0AfRzPCN/r6jGUwwCdJMRnBHAniq2ty5hR fVWFfHMa8ejXkxjsHpRcUfDeoQrzXbaUTki/p39RQMDCtMv5DwtCNk2oHKn+bawx8XqnRe 9tHxuzI3YfikIQU7mOcHEVoovhMvKpE= X-MC-Unique: slRKtakaO1G0OhtJkbOVCA-1 X-Mimecast-MFC-AGG-ID: slRKtakaO1G0OhtJkbOVCA_1768250447 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 05/13] scripts/mtest2make: ensure output has stable sorting Date: Mon, 12 Jan 2026 20:40:18 +0000 Message-ID: <20260112204026.710659-6-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250625740158500 When debugging mtest2make.py changes it is important to be able to compare the old and new output. This requires that any lists in the output have stable sort ordering. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- scripts/mtest2make.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 4b252defc3..915f02d600 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -67,8 +67,10 @@ def process_tests(test, targets, suites): suites[s].speeds.add('thorough') =20 def emit_prolog(suites, prefix): - all_targets =3D ' '.join((f'{prefix}-{k}' for k in suites.keys())) - all_xml =3D ' '.join((f'{prefix}-report-{k}.junit.xml' for k in suites= .keys())) + all_targets =3D ' '.join((f'{prefix}-{k}' + for k in sorted(suites.keys()))) + all_xml =3D ' '.join((f'{prefix}-report-{k}.junit.xml' + for k in sorted(suites.keys()))) print() print(f'all-{prefix}-targets =3D {all_targets}') print(f'all-{prefix}-xml =3D {all_xml}') @@ -81,12 +83,12 @@ def emit_prolog(suites, prefix): print(f'\t$(MAKE) {prefix}$* MTESTARGS=3D"$(MTESTARGS) --logbase {pref= ix}-report$*" && ln -f meson-logs/$@ .') =20 def emit_suite(name, suite, prefix): - deps =3D ' '.join(suite.deps) + deps =3D ' '.join(sorted(suite.deps)) print() print(f'.{prefix}-{name}.deps =3D {deps}') print(f'.ninja-goals.check-build +=3D $(.{prefix}-{name}.deps)') =20 - names =3D ' '.join(suite.names(name)) + names =3D ' '.join(sorted(suite.names(name))) targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml' if not name.endswith('-slow') and not name.endswith('-thorough'): targets +=3D f' {prefix} {prefix}-report.junit.xml' --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250628; cv=none; d=zohomail.com; s=zohoarc; b=Or6GXvIXa2jhFh/iJrk3Lw7jUDmEevfMKi9tSIR5FFVrHlOEdMepDNUCTOpnWWEVASuW432zXVZJfHzjuO2yYqqQXLFUVPUL87QoJkIsKDs23JKX5s/CJmStrywvhKGULxEuZsC379CY81PpvVD6bnkgM8w1cSfatPrXYsozyxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250628; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GxfQ8+uJRBHSX3Q0kai+sJg8CqXlMf/0CxzYd5JE134=; b=Rr0If+O+6JQrRxlZXdhy7w/do6pgeRel2qPjSZS0JrNut2V5+IBlM9FIN8VkVk9fYGBi23zlyn1iMQcsgTlL6fuwxETTxP42D8v8z3xalOIY6TT6oseHVIHHFtPm5DtC4bp5y/wDESryLuTRGmMTDvP+JmX4bwIHl39t8bo/i8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250628411571.8566498416575; Mon, 12 Jan 2026 12:43:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOij-0007GK-4J; Mon, 12 Jan 2026 15:41:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOig-0007EV-UU for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOif-0000n7-He for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:58 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-nFVx6kqwPJ6CmsNiVh-r3w-1; Mon, 12 Jan 2026 15:40:52 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 819521800365; Mon, 12 Jan 2026 20:40:50 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B532A30001A2; Mon, 12 Jan 2026 20:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GxfQ8+uJRBHSX3Q0kai+sJg8CqXlMf/0CxzYd5JE134=; b=g4+4fy3gmFQBAXjjtpkL7xFT248PqQvmtC36Ak8xlH9boOQgOOItJOyfcK6v8fEojKMZBG EHIYqUEra5oA+kTWjW6NUdo9XaUXdXphG0KxgmRWc7Eg2kwPeGgoEdoBM2NtB3Bx5eXxYE lJws9HEUGd3Ub6laSI2ZzbDIxIZDDfo= X-MC-Unique: nFVx6kqwPJ6CmsNiVh-r3w-1 X-Mimecast-MFC-AGG-ID: nFVx6kqwPJ6CmsNiVh-r3w_1768250450 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 06/13] scripts/mtest2make: support optional tests grouping Date: Mon, 12 Jan 2026 20:40:19 +0000 Message-ID: <20260112204026.710659-7-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250629776158500 Currently tests can be classified into three speed groups depending on whether the meson suite name ends in '-slow' or '-thorough' or neither. This gets turned into make targets that match the name of the meson suite, with the speed suffix stripped. e.g. * suite=3Dblock -> 'make check-block' * suite=3Dblock-slow -> 'make check-block SPEED=3Dslow' * suite=3Dblock-thorough -> 'make check-block SPEED=3Dthorough' The set of tests under the "thorough" speed, however, can get rather large and it would be useful to have a way to expose further make targets for directly running a particular subset of tests. This needs a way to run a target without requiring the SPEED varaible, while also not having them enabled by default as if they were 'quick' tests. This modifies mtest2make.py to support this idea by allowing for a new suffix '-optional' on a suite. When this is present, a correspondingly named make target will be created without the '-optional' suffix which will never be run automatically. This is intended to be combined with use of other suites. For example, a single NBD test might be added to two suites, 'block-thorough' and 'block-nbd-optional'. This would allow running it as part of all the block tests with 'make check-block SPEED=3Dthorough', and as part of a standalone target 'make check-block-nbd'. Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/mtest2make.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 915f02d600..383ea68b16 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -22,7 +22,7 @@ def names(self, base): print(r''' SPEED =3D quick =20 -.speed.quick =3D $(sort $(filter-out %-slow %-thorough, $1)) +.speed.quick =3D $(sort $(filter-out %-slow %-thorough %-optional, $1)) .speed.slow =3D $(sort $(filter-out %-thorough, $1)) .speed.thorough =3D $(sort $1) =20 @@ -66,10 +66,15 @@ def process_tests(test, targets, suites): s =3D s[:-9] suites[s].speeds.add('thorough') =20 +def target_name(suite): + if suite.endswith('-optional'): + return suite[0:-9] + return suite + def emit_prolog(suites, prefix): - all_targets =3D ' '.join((f'{prefix}-{k}' + all_targets =3D ' '.join((f'{prefix}-{target_name(k)}' for k in sorted(suites.keys()))) - all_xml =3D ' '.join((f'{prefix}-report-{k}.junit.xml' + all_xml =3D ' '.join((f'{prefix}-report-{target_name(k)}.junit.xml' for k in sorted(suites.keys()))) print() print(f'all-{prefix}-targets =3D {all_targets}') @@ -83,14 +88,17 @@ def emit_prolog(suites, prefix): print(f'\t$(MAKE) {prefix}$* MTESTARGS=3D"$(MTESTARGS) --logbase {pref= ix}-report$*" && ln -f meson-logs/$@ .') =20 def emit_suite(name, suite, prefix): + tgtname =3D target_name(name) deps =3D ' '.join(sorted(suite.deps)) print() - print(f'.{prefix}-{name}.deps =3D {deps}') - print(f'.ninja-goals.check-build +=3D $(.{prefix}-{name}.deps)') + print(f'.{prefix}-{tgtname}.deps =3D {deps}') + print(f'.ninja-goals.check-build +=3D $(.{prefix}-{tgtname}.deps)') =20 names =3D ' '.join(sorted(suite.names(name))) - targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml' - if not name.endswith('-slow') and not name.endswith('-thorough'): + targets =3D f'{prefix}-{tgtname} {prefix}-report-{tgtname}.junit.xml' + if not name.endswith('-slow') and \ + not name.endswith('-thorough') and \ + not name.endswith('-optional'): targets +=3D f' {prefix} {prefix}-report.junit.xml' print(f'ifneq ($(filter {targets}, $(MAKECMDGOALS)),)') # for the "base" suite possibly add FOO-slow and FOO-thorough --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250626; cv=none; d=zohomail.com; s=zohoarc; b=XMxuQ0E7usqMKAzTKwzmfYfBN8luxcot8t6HrEsukQeBRZpXeZ9hePe9maCJDBtxgRTTBn1aRLFipnL/XEXXoZ+aQi7rboT2ED55GXld98n2mpq2eH4YmmFHOhf8HPabq5oy4FVasSMwrPG/pTHw0cPDwlGBf9U12uC52YbGauI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250626; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vmd+lG//fjnEIzulqaegvbh8KAWoHQ7DLO8b4iiFIhE=; b=YScuqGFKWuK4xE8j8Hu2ikvPtwaKr3eOBuxKD1EQFgkIbW7TnVvTUTTS880V0LO9ZrfftmBIoGIcEuuMreMcp6NvaL8nHzx4B1Rgpo6tL555c4atzCJR+Loz8hxAnpXqzEybdEF8NUYLyr3NlLaxYXNZq99YAKN63AJbRRhEn1o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250626485628.1103150257305; Mon, 12 Jan 2026 12:43:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOij-0007GM-4k; Mon, 12 Jan 2026 15:41:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOii-0007FX-8T for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOig-0000nG-JI for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:00 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-xzsq59GFNnmtB4OVdvEWUw-1; Mon, 12 Jan 2026 15:40:54 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 95C27195609E; Mon, 12 Jan 2026 20:40:53 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C65F730001A2; Mon, 12 Jan 2026 20:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vmd+lG//fjnEIzulqaegvbh8KAWoHQ7DLO8b4iiFIhE=; b=gQeByC/NSNpiqeR7Mc5hxV+x6NL3EvnIoruQAVh2IWcw2a9YF1H7Pqy+pmkctWvYL/YsBI GAI319Ifiq/88s9mGipCIlIbqHBSZFUYztWsBdOuD4Eoetuwsj3AT9HNTvn9GfU4bGbniM dy70i/oZqj+G6OQMpJaSxbBHl+PletI= X-MC-Unique: xzsq59GFNnmtB4OVdvEWUw-1 X-Mimecast-MFC-AGG-ID: xzsq59GFNnmtB4OVdvEWUw_1768250453 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 07/13] tests: add a meson suite / make target per block I/O tests format Date: Mon, 12 Jan 2026 20:40:20 +0000 Message-ID: <20260112204026.710659-8-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250627747158500 Currently each block format is classified as either 'quick', 'slow' or 'thorough' and this controls whether its I/O tests are added to the meson suites 'block-quick', 'block-slow' or 'block-thorough'. This suites are exposed the 'check-block' make target, accepting the optional SPEED variable. As we add more formats to the 'thorough' group, however, it becomes increasingly large and time consuming to run. What is needed is a make target that can exercise all tests for an individual format, regardless of speed classification. This makes use of the previous enhancement to mtest2make.py to introduce new meson suites 'block-$FORMAT-optional', which translate to new top level make targets 'check-block-$FORMAT'. These new targets always run all tests and as such do not need the SPEED variable to be set, but are not triggered by 'make check' or 'make check-block'. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/Makefile.include | 3 ++- tests/qemu-iotests/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 7728098981..fc6fdcbbf9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -14,7 +14,8 @@ check-help: @echo " $(MAKE) check-unit Run qobject tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-tracetool Run tracetool generator tests" - @echo " $(MAKE) check-block Run block tests" + @echo " $(MAKE) check-block Run block tests (all formats)" + @echo " $(MAKE) check-block-FORMAT Run block tests (only for FORMAT= )" ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 1a24d801a3..16a5e39476 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -62,7 +62,8 @@ foreach format, speed: qemu_iotests_formats endforeach endif =20 - suites =3D [] + # Every format gets put in the format specific suite + suites =3D ['block-' + format + '-optional'] # Any format tagged quick or slow also gets added to slow # otherwise its tagged thorough if speed !=3D 'thorough' --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250522; cv=none; d=zohomail.com; s=zohoarc; b=DrsSoqorv/z8Gr9rOVXncSW5D2JVvwdtScgVslcuQzgEUPNrynS80nqhIGzKCqvODOr8lAX2s2ELOjP9tC9amdBJ6BdcrACQJBSpXqjU59jFpdAdyhbtPpAl7CiPuUxeMmH1jN9nXxarDArCSg1l1Jl3cL7Y9A+TuzN8aIa9tQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250522; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yafivwiApDWfXXVMORytyI2Zaisu4j8GPQ608VS34GE=; b=Ir3zi7P55GsB4WiF3UOerbWB/3M/Hs+elicKstOjpha6jkSe0/AXsMIo/nip5ykk5aG/ISYOO31qzEqoqbFyM9qr2t/KYn8q8AwEwffkulE1a3dpxmUEobWw11yLjIEqaqtroWWFNyDeg9Si6G4uvXZ8RDO1mg7Yzj9sYlPUzsQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250522512794.7103200512233; Mon, 12 Jan 2026 12:42:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOik-0007Jq-LR; Mon, 12 Jan 2026 15:41:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOij-0007Gg-Am for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOih-0000nc-P4 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:01 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-73-gKiwDdC2NfOI1C2nxj8Qkg-1; Mon, 12 Jan 2026 15:40:57 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A4CBA1956068; Mon, 12 Jan 2026 20:40:56 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F128430001A2; Mon, 12 Jan 2026 20:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yafivwiApDWfXXVMORytyI2Zaisu4j8GPQ608VS34GE=; b=TBOhferYVxmfF6fyfxYE7O39h7wWZLkvbKSJqo3vn+cs1JYmEQA8jOif0Zt22pEpCIblQt BcfgIE6/Hxu+7GkdW8V+0ngP1JjAZCBB0uFBDu8VJ9/U9a+Iv/6e2arP5zvGY60h5OGFL5 qY1vdk+qCH7AlSRcVI37Sz0BlOZWS2E= X-MC-Unique: gKiwDdC2NfOI1C2nxj8Qkg-1 X-Mimecast-MFC-AGG-ID: gKiwDdC2NfOI1C2nxj8Qkg_1768250456 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 08/13] docs/devel/testing: expand documentation for 'make check-block' Date: Mon, 12 Jan 2026 20:40:21 +0000 Message-ID: <20260112204026.710659-9-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250523491158500 Explain in greater detail what 'check-block' will run for each format, and also document the new format specific targets. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- docs/devel/testing/main.rst | 27 ++++++++++++++++++++++++--- tests/qemu-iotests/meson.build | 2 ++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index 0662766b5c..ec29cf7708 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -221,9 +221,30 @@ same commit that alters the generator code. check-block ~~~~~~~~~~~ =20 -``make check-block`` runs a subset of the block layer iotests (the tests t= hat -are in the "auto" group). -See the "QEMU iotests" section below for more information. +There are a variety of ways to exercise the block layer I/O tests +via make targets. + +A default ``make check`` or ``make check-block`` command will exercise +the ``qcow2`` format, using the tests tagged into the ``auto`` group +only. + +These targets accept the ``SPEED`` variable to augment the set of tests +to run. A slightly more comprehensive test plan can be run by defining +``SPEED=3Dslow``, which enables all tests for the ``qcow2`` and ``raw`` +formats. The most comprehensive test plan can be run by defining +``SPEED=3Dthorough``, which enables all available tests for every format. + +This set of formats currently enabled for make integration are +``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, ``vhdx``, +``vmdk``, and ``vpc``. + +Each of formats also has its own dedicated make target, named +``make check-block-$FORMAT`` which will run all available tests for +the designated format and does not require the ``SPEED`` variable +to be set. + +See the "QEMU iotests" section below for more information on the +block I/O test framework that is leveraged by these ``make`` targets. =20 .. _qemu-iotests: =20 diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 16a5e39476..66b09d6b97 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -10,6 +10,8 @@ endif =20 qemu_iotests_binaries =3D [qemu_img, qemu_io, qemu_nbd, qsd] qemu_iotests_env =3D {'PYTHON': python.full_path()} +# If altering this definition, also update docs/devel/testing/main.rst +# section on 'check-block' targets to reflect the changes qemu_iotests_formats =3D { 'qcow2': 'quick', 'raw': 'slow', --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250499; cv=none; d=zohomail.com; s=zohoarc; b=JWmwf7v4gWJp05PT10I70ws70MNdPR4WVx1j03/g3+2KHUERDU9qbWkQWVuRefQktDYnx+7bYEhsHDTGnoo062APUDo/k39TlOq2tyQflF+9P/WDz/snIKG9rRFyWQvXo4LHrIaj2rPr3iZ7EiiUIBtuUtJlMsjkLICldB+Bm2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250499; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6mK0AxmYtwmoywSBsV2ddFa1XqazgTvlxchz2B7gUw0=; b=fwlxQCCWzs5QUmCEtMMTVxDCVOaH8DOZ7D8moOPb3mlUMDZEjtOpxoANO2ECm6r3o0ptbvMOHpQindJf3CJ01IgO85yvsJMyV4/5efGDZO5K7ohYmBPSOT2LxTivjHZhGiZKRPwXD9xfRwFE0QCWgKb811USiW+DTgxr3Fdktso= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250499166123.53714868409497; Mon, 12 Jan 2026 12:41:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOip-0007RD-T3; Mon, 12 Jan 2026 15:41:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOio-0007OM-EO for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOin-0000oX-3V for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:06 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-669-zUI357JQMeOWwctkUOHK6Q-1; Mon, 12 Jan 2026 15:41:00 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B5F731956063; Mon, 12 Jan 2026 20:40:59 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E80930001A2; Mon, 12 Jan 2026 20:40:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6mK0AxmYtwmoywSBsV2ddFa1XqazgTvlxchz2B7gUw0=; b=Rk7bItPmAqyDj/2rDh0zDvw0NGEbgHaGhjsfXOhTGfLXNJfiKdjHTZN+yL1YY/gDoKZNl9 Z1zmM6+ev+8+BQLCo0QiTUcsQdllAL3t7nbam6x+JjeEq6EVjcqmZBSseltWyDeBSjmsTX S8HAaI0/bo/bnjxOUFGGXAi6JiV5WCg= X-MC-Unique: zUI357JQMeOWwctkUOHK6Q-1 X-Mimecast-MFC-AGG-ID: zUI357JQMeOWwctkUOHK6Q_1768250459 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 09/13] tests: add nbd and luks to the I/O test suites Date: Mon, 12 Jan 2026 20:40:22 +0000 Message-ID: <20260112204026.710659-10-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250501849158500 This introduces new suites for running I/O tests on NBD and LUKS drivers, giving new make targets * make check-block-luks * make check-block-nbd as well as adding their tests to 'make check-block SPEED=3Dthorough' Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing/main.rst | 4 ++-- tests/qemu-iotests/meson.build | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index ec29cf7708..910ec11ab4 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -235,8 +235,8 @@ formats. The most comprehensive test plan can be run by= defining ``SPEED=3Dthorough``, which enables all available tests for every format. =20 This set of formats currently enabled for make integration are -``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, ``vhdx``, -``vmdk``, and ``vpc``. +``luks``, ``nbd``, ``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, +``vhdx``, ``vmdk``, and ``vpc``. =20 Each of formats also has its own dedicated make target, named ``make check-block-$FORMAT`` which will run all available tests for diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 66b09d6b97..744d0b6e88 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -15,12 +15,14 @@ qemu_iotests_env =3D {'PYTHON': python.full_path()} qemu_iotests_formats =3D { 'qcow2': 'quick', 'raw': 'slow', + 'luks': 'thorough', + 'nbd': 'thorough', 'parallels': 'thorough', 'qed': 'thorough', 'vdi': 'thorough', 'vhdx': 'thorough', 'vmdk': 'thorough', - 'vpc': 'thorough' + 'vpc': 'thorough', } =20 foreach k, v : emulators --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250620; cv=none; d=zohomail.com; s=zohoarc; b=hQsZXWhHUqglib12t9Y78JVYFBUku116fHByPrclhKRu+lnA6eduBd7urqQ0VGHnkKAYaiwJ+MpqS9PBfynqgO80Iukr8+wwOGmDQfSJ8ex9WVM5VKton/LNRWi1xGBUEhW9Tpc92F77NtIO4AwKyafQfUqQ7DXp6lU3oSmBDoo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250620; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bn9QlZwajKzYZoSGG4aQOmoXWg/XzF/D83OZzvhryH0=; b=FuFuUQWw5lPhxtI75zdjWUozVX4HFWTGeLWmBwjridnYzRno4vbfjR8IltgwC9HWe171X9FmlzTja7gKMxZbzz1t4vEkkf1k17s3miR2eEnm0JzdqwrBvSfWRBtl9Ae788+KOT48vVnJk0qK1TjmwBP3v/UUwfBUkUQOKZQEQuk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250620365627.1878164241399; Mon, 12 Jan 2026 12:43:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOis-0007Tz-CJ; Mon, 12 Jan 2026 15:41:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOir-0007SQ-43 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOip-0000ou-Ku for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:08 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-nM9Zr0THMNy-uNI7Xt-cnA-1; Mon, 12 Jan 2026 15:41:03 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C812F1800473; Mon, 12 Jan 2026 20:41:02 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1BE2430001A2; Mon, 12 Jan 2026 20:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bn9QlZwajKzYZoSGG4aQOmoXWg/XzF/D83OZzvhryH0=; b=XSgFI3Ux2sxDTnuwKjImoWzxUmPftUAFMZOHH6+U/OridIirYalJHccGvLejNxno9jgAiU 3xPuxyIvxlYJJk/HeXilCpk4hEMBRDNxgw386lHYXMpi/E75JRMVO73hCc53DZlvuzi1By MT2Y4zN6kT/d0O4WsL7THFQm7h84Q/I= X-MC-Unique: nM9Zr0THMNy-uNI7Xt-cnA-1 X-Mimecast-MFC-AGG-ID: nM9Zr0THMNy-uNI7Xt-cnA_1768250462 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 10/13] tests: skip I/O test 128 on GitLab due to broken dmsetup Date: Mon, 12 Jan 2026 20:40:23 +0000 Message-ID: <20260112204026.710659-11-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250621730158500 The I/O test 128 uses 'dmsetup create' to create a device, optionally using sudo to elevate privileges. This works in GitLab CI, however, the resulting device never appears in /dev leading the test to fail: 1..1 # running raw 128 not ok raw 128 ----------------------------------- stderr ------------------------------= ----- --- /builds/berrange/qemu/tests/qemu-iotests/128.out +++ /builds/berrange/qemu/build/scratch/raw-file-128/128.out.bad @@ -1,5 +1,5 @@ QA output created by 128 =3D=3D reading from error device =3D=3D -read failed: Input/output error +qemu-io: can't open device /dev/mapper/eiodev16546: Could not open '/dev= /mapper/eiodev16546': No such file or directory *** done (test program exited with status code 1) Most likely the container environment the tests are being run under has a hand-populated /dev such that newly created devices from device mapper won't automatically appear. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/128 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index d0e00d24b1..b32e03beee 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -73,6 +73,8 @@ _supported_fmt raw _supported_proto file _supported_os Linux =20 +test -n "$GITLAB_CI" && _notrun "dmsetup not functional on GitLab CI runne= rs" + _setup_eiodev =20 TEST_IMG=3D"/dev/mapper/$devname" --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250523; cv=none; d=zohomail.com; s=zohoarc; b=L12Q7zrkCRYR72vnYo4HvlpafEenu8uAq47Mtp07LG68xPbMZhObjarb3xJLabakLrrvadqTcMk5FCgc33ppimTLXSakr7+pV78ApHALuyOIhfgL6/zMguK/XBpGMZ0IK9bocsavfIlFx3x+7zOpILuSU4W4Ja4Zhjz5UILef8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250523; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TjJjXYhqAqMMWNPFKjmLilyqpzv5zO8m2GOeGWEZKgg=; b=KkhX8lxe0G6At8L/lgkqfpzX5DHkpS3K4TL9DGssyuq97bHvIJxDj53UmgH/8tbTz/MOqi2iauExx6TXdLRDyv+qxc7FxOicES+wJlfsKHBUQbG66gzfZm88qCSPqKNfb+nQaUWRtmp99b5zDs3WappCbtZGSKSqxqMU9Qu7ER4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176825052347635.15225792698993; Mon, 12 Jan 2026 12:42:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOiw-0007bv-3Q; Mon, 12 Jan 2026 15:41:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiu-0007Zm-BR for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOit-0000pP-1b for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:12 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-232--msJ491wNIOWAwaAFD2DXA-1; Mon, 12 Jan 2026 15:41:07 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F2A1D195609E; Mon, 12 Jan 2026 20:41:05 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 31A7030001A2; Mon, 12 Jan 2026 20:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TjJjXYhqAqMMWNPFKjmLilyqpzv5zO8m2GOeGWEZKgg=; b=CuHfpDAH8+i38Bg/bV29i/oS4VWy10KxvJM8dY7nGmxr4BaHITe/n6uy/NCoB1gUBR+ZoM mKt/OUO+LRb0gS+XJ54+2ljW0g6LOAR+oaSXLRyy+lZ0MQG76lPQD/yaOGgrnV/7FUD6Kd trc1JELu7bXfYoIFotLZsE36x5V0yTw= X-MC-Unique: -msJ491wNIOWAwaAFD2DXA-1 X-Mimecast-MFC-AGG-ID: -msJ491wNIOWAwaAFD2DXA_1768250466 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 11/13] tests: fix check for sudo access in LUKS I/O test Date: Mon, 12 Jan 2026 20:40:24 +0000 Message-ID: <20260112204026.710659-12-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250525252158500 The test did not cope with the possibility that 'sudo' was not installed at all, merely that it was not configured. This broke tests in any CI env which lacks 'sudo'. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- tests/qemu-iotests/149 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index c13343d7ef..6dff39a28a 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -95,11 +95,14 @@ def verify_passwordless_sudo(): =20 args =3D ["sudo", "-n", "/bin/true"] =20 - proc =3D subprocess.Popen(args, - stdin=3Dsubprocess.PIPE, - stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.STDOUT, - universal_newlines=3DTrue) + try: + proc =3D subprocess.Popen(args, + stdin=3Dsubprocess.PIPE, + stdout=3Dsubprocess.PIPE, + stderr=3Dsubprocess.STDOUT, + universal_newlines=3DTrue) + except FileNotFoundError as e: + iotests.notrun('requires sudo binary: %s' % e) =20 msg =3D proc.communicate()[0] =20 --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250527; cv=none; d=zohomail.com; s=zohoarc; b=ac5lPkTmOXJBIVA/Qh8YW59Ji0RIE1KqRd18Ok8UqhCbI3DRhq9aYE9GxrQQAl8P2E9pNcPCW73Mcm34CEv1qcr1rJNVtVAOOw/F7dbGNHxxa5y+kLuJc7fvG8a1XhyNQJ6QIyFCbxt6HM5eAjLwIJNXHrUQCHA6M5P4oyfDSqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250527; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dF1H6qznpiQYfOI1hQnBHGD2oROtcCfhHIsx6kC/alQ=; b=nhz6fgSC1lXHOvajy0UN/Lk8pY1mH4B4+gB+jfIvQsUIb7G/Et4VKx9eOVw0+ULBfVzL7Otich0woPm0FaQ6TPrFKngjD0/jQ3FhcK6tsidYDOiJBFLusCjK3B+uk+YR+l+Wg++CpRWrivjRDfXVgXim8ouxGvhGPfiT2mhDapU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250527961730.3267818228551; Mon, 12 Jan 2026 12:42:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOiz-0007dK-6F; Mon, 12 Jan 2026 15:41:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOix-0007cl-Ft for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiw-0000r2-0d for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:15 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-399-pllCwTavPY6_kUCBG7LM2A-1; Mon, 12 Jan 2026 15:41:10 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 11E9918003FD; Mon, 12 Jan 2026 20:41:09 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5C4B330001A2; Mon, 12 Jan 2026 20:41:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dF1H6qznpiQYfOI1hQnBHGD2oROtcCfhHIsx6kC/alQ=; b=gaK4hWW1RiagmizO+VVSo22Bt+XaauxWNHr/mwj+/u+F3mwDau3cPWpamZ6Mu/UP8YQ2mV tY9Cd0aHSCATzK2cv4SeUUSz2RVGPDK9GGyR4vCVyrsyi+JxnPHilunf9o7wxqXf704wLu MeurXZUihC0SxzX0NHcm8rrWm+r8xmM= X-MC-Unique: pllCwTavPY6_kUCBG7LM2A-1 X-Mimecast-MFC-AGG-ID: pllCwTavPY6_kUCBG7LM2A_1768250469 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 12/13] tests: add QEMU_TEST_IO_SKIP for skipping I/O tests Date: Mon, 12 Jan 2026 20:40:25 +0000 Message-ID: <20260112204026.710659-13-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250529477158501 The nature of block I/O tests is such that there can be unexpected false positive failures in certain scenarios that have not been encountered before, and sometimes non-deterministic failures that are hard to reproduce. Before enabling the I/O tests as gating jobs in CI, there needs to be a mechanism to dynamically mark tests as skipped, without having to commit code changes. This introduces the QEMU_TEST_IO_SKIP environment variable that is set to a list of FORMAT-OR-PROTOCOL:NAME pairs. The intent is that this variable can be set as a GitLab CI pipeline variable to temporarily disable a test while problems are being debugged. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- docs/devel/testing/main.rst | 7 +++++++ tests/qemu-iotests/testrunner.py | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index 910ec11ab4..bb90ea5f15 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -285,6 +285,13 @@ that are specific to certain cache mode. More options are supported by the ``./check`` script, run ``./check -h`` f= or help. =20 +If a test program is known to be broken, it can be disabled by setting +the ``QEMU_TEST_IO_SKIP`` environment variable with a list of tests to +be skipped. The values are of the form FORMAT-OR-PROTOCOL:NAME, the +leading component can be omitted to skip the test for all formats and +protocols. For example ``export QEMU_TEST_IO_SKIP=3D"luks:149 185 iov-padd= ing`` +will skip for LUKS only, and ``185`` and ``iov-padding`` for all. + Writing a new test case ~~~~~~~~~~~~~~~~~~~~~~~ =20 diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index dbe2dddc32..ecb5d4529f 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -145,6 +145,18 @@ def __init__(self, env: TestEnv, tap: bool =3D False, =20 self._stack: contextlib.ExitStack =20 + self.skip =3D {} + for rule in os.environ.get("QEMU_TEST_IO_SKIP", "").split(" "): + rule =3D rule.strip() + if rule =3D=3D "": + continue + if ":" in rule: + fmt, name =3D rule.split(":") + if fmt in ("", env.imgfmt, env.imgproto): + self.skip[name] =3D True + else: + self.skip[rule] =3D True + def __enter__(self) -> 'TestRunner': self._stack =3D contextlib.ExitStack() self._stack.enter_context(self.env) @@ -251,6 +263,10 @@ def do_run_test(self, test: str) -> TestResult: description=3D'No qualified output ' f'(expected {f_reference})') =20 + if f_test.name in self.skip: + return TestResult(status=3D'not run', + description=3D'Listed in QEMU_TEST_IO_SKIP') + args =3D [str(f_test.resolve())] env =3D self.env.prepare_subprocess(args) =20 --=20 2.52.0 From nobody Sun Feb 8 11:06:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250573; cv=none; d=zohomail.com; s=zohoarc; b=CmVchDbWITyem8yeSvaNJZ9rdh4xuMj8wP3JffNlaYiUkGGxfLOvSDxUE+k/O1Z599K1Wl43lD0gfbI4XpfGi3s+m648yL9KjRfJ21qVbOniTqbYlzh0vT5Ml7OTNbrqhiFq8sbPtDE12USxvWfMtjmEaiU717Mdj1iMRn0+Z3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250573; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UMn63bOJQhAOg/v+TewVWoe8dU8MB0WCw937hEIH9qA=; b=JlTLBEYylMhPVxyZdjIGtQYRoufEtoZ/eHfr/xvbrSbrrKXT8VEA6QfmdwACsqgqrzeuojWQuFnbF/OICzmhgG/J72p1uvWCEanpokrwZDBRSd+4XxNiQivPyPIMCHxyYChwK53L2Z+rp7RXu1zdKtDPES8RKHjVrP5VP1ttrj0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176825057382371.96108370232173; Mon, 12 Jan 2026 12:42:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOj0-0007e1-Ax; Mon, 12 Jan 2026 15:41:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOiz-0007dI-1Y for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOix-0000rF-Ek for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:41:16 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-204-pKVP9DuqM-CwyXP0O84_Yg-1; Mon, 12 Jan 2026 15:41:13 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 22E081956067; Mon, 12 Jan 2026 20:41:12 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6A83730001A2; Mon, 12 Jan 2026 20:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UMn63bOJQhAOg/v+TewVWoe8dU8MB0WCw937hEIH9qA=; b=S7dg8Mc1+FwlaElgWHGOgcX1M9arkrrzWqdU5DO0WjVojqxF10BNoOBAGzlyUueYPHDz7S vv6RE0ex18M0pCCONPAwFfCge9JPVgr7XdWfjMzMCXLXIq5H7WqX5H+ERZX6HKDR8lCyRR SrhZmOv1baFu5Yq3QuWMSXWGr4kWrtA= X-MC-Unique: pKVP9DuqM-CwyXP0O84_Yg-1 X-Mimecast-MFC-AGG-ID: pKVP9DuqM-CwyXP0O84_Yg_1768250472 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 13/13] gitlab: add jobs for thorough block tests Date: Mon, 12 Jan 2026 20:40:26 +0000 Message-ID: <20260112204026.710659-14-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250575535158500 CI is only exercising the qcow2 'auto' tests currently. As a result we get no exposure of changes which cause regressions in other block format drivers. This adds new CI jobs for each block format, that will run the target 'make check-block-$FORMAT'. The jobs are separate so that we have the ability to make each format gating or not, depending on their level of reliability. There is currently an undiagnosed failure of job 185 with the qcow2 when run in CI that is marked to be skipped, reported at: https://gitlab.com/qemu-project/qemu/-/issues/3270 Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest.yml | 92 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index dfe954fe3c..91b398bd63 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -176,6 +176,98 @@ build-system-centos: x86_64-softmmu rx-softmmu sh4-softmmu MAKE_CHECK_ARGS: check-build =20 +block-luks-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-luks + +block-nbd-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-nbd + +block-parallels-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-parallels + +block-qcow2-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-qcow2 + # https://gitlab.com/qemu-project/qemu/-/issues/3270 + QEMU_TEST_IO_SKIP: qcow2:185 + +block-qed-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-qed + +block-raw-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-raw + +block-vdi-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-vdi + +block-vhdx-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-vhdx + +block-vmdk-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-vmdk + +block-vpc-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-vpc + # Previous QEMU release. Used for cross-version migration tests. build-previous-qemu: extends: .native_build_job_template --=20 2.52.0