From nobody Sat Apr 11 23:08:18 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=1772634133; cv=none; d=zohomail.com; s=zohoarc; b=cC764DGLqz6tConcsrgMFXY7Xow00O9hT4cAFJJElSYvPog3lbCSByHffmIOSZmvSL6Pg0D2Dp+WAcRnREDUyooBZ4W8qKxzPgTEIgWCHexB9CflzP61g/PiN2X/rhwviQh1mXLs1Eke5fxR67Gbnra7ZiSJpITHV+Wk28aneSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634133; 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=Ehl1r1nmZQv+ZMvc2ktdLuZfSateXOGKJA9NMoTEsmM=; b=arwfoCbZ9+xU2X2g+RP1Uf+U3bEgWL3OYR+5IPuSphZwXld21V1bb8zCW0Um/AFegVcoN0fwvyDYDYvwKUmcl7CBsre6cyqZrHCkOQV3slUz9o57c7iZiRc20zqQ8Qsrfg00gtFMv++t2B9n6rNhAhux1aOU621kAmCi5HU6CNk= 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 1772634133620324.8957643232785; Wed, 4 Mar 2026 06:22:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn6k-0007wz-0C; Wed, 04 Mar 2026 09:21:53 -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 1vxn6X-0007uB-Ae for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:38 -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 1vxn6V-000670-Ql for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:37 -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-453-v0ypvXDGMBC9iAjCeSEaNA-1; Wed, 04 Mar 2026 09:21:31 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 9773418005B8; Wed, 4 Mar 2026 14:21:30 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EFC2E1958DC2; Wed, 4 Mar 2026 14:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634095; 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=Ehl1r1nmZQv+ZMvc2ktdLuZfSateXOGKJA9NMoTEsmM=; b=aQIpxvDcM0YxQuarbV1FLDkfwe6L78DulHTlsiEnMd38geMrySl3k/nNc9iR6SpAXZtLIi rt/VB6aUkxxenxa7NSdePgqgw4GcSGykLaLehQ09wqx2xmBXtM2wTTC2fhNOijj5U6mZoC 0ahWJUROtt0d3LjdzEqD7LIMF7sVq+c= X-MC-Unique: v0ypvXDGMBC9iAjCeSEaNA-1 X-Mimecast-MFC-AGG-ID: v0ypvXDGMBC9iAjCeSEaNA_1772634090 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 01/15] gitlab: ensure all meson jobs capture build/meson-logs by default Date: Wed, 4 Mar 2026 14:21:06 +0000 Message-ID: <20260304142120.2635617-2-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634135786154100 The build-without-defaults and build-tci jobs do not capture any artifacts, despite running 'make check'. This has proved a repeated bug with CI jobs, so introduce a new '.meson_job_template' rule which always captures 'build/meson-logs'. Jobs can still provide their own 'artifacts:' config which will override this default behaviour. Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest-template.yml | 30 ++++++++++++++++++----------- .gitlab-ci.d/buildtest.yml | 4 +++- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index d866cb12bb..005058625e 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -1,5 +1,20 @@ -.native_build_job_template: + +# Any job running meson should capture meson logs +# by default. Some jobs might override the artifacts +# to capture further files +.meson_job_template: extends: .base_job_template + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always + expire_in: 7 days + paths: + - build/meson-logs + reports: + junit: build/meson-logs/*.junit.xml + +.native_build_job_template: + extends: .meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG cache: @@ -60,7 +75,7 @@ - build/**/*.c.o.d =20 .common_test_job_template: - extends: .base_job_template + extends: .meson_job_template stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG script: @@ -87,14 +102,7 @@ # Prevent logs from the build job that run earlier # from being duplicated in the test job artifacts - rm -f build/meson-logs/* - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: always - expire_in: 7 days - paths: - - build/meson-logs - reports: - junit: build/meson-logs/*.junit.xml + =20 .functional_test_job_template: extends: .common_test_job_template @@ -125,7 +133,7 @@ QEMU_JOB_FUNCTIONAL: 1 =20 .wasm_build_job_template: - extends: .base_job_template + extends: .meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG before_script: diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 6ad3594522..4b20429c7f 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -652,7 +652,9 @@ build-tci: =20 # Check our reduced build configurations build-without-defaults: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-centos9-container variables: --=20 2.53.0 From nobody Sat Apr 11 23:08:18 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=1772634133; cv=none; d=zohomail.com; s=zohoarc; b=cW4rQ3Lc31FqAhyTUVO4Sx4ZgBUtlmhyHWlbt15QtP5NylDVzL+2mRVuhCKtdUXnwf12Q4vdtONNP6LnPPo8+JVReLs85K2WLv5ddwEATi4Kj/JFD6BnThLh9tCoMpDW28GqxrrVXUnUstzD8gAQIysS9ZJjnMhYjKX5SCLFb/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634133; 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=iBpdYNbW/Xk/UNHoV+Doxxi9hHsYlnHzAUV0ayVujkw=; b=oAoc3qiWptexxFs8WXVYSZgHc3ana1Nl9+63YVS6d7PSj9/EXKM2uVzeKFXyA2coe32Rgbguo8dkr0fhDiOz4s27a6m3bCSkyGTFIPoByeCx18rf8X6s1SXVnbxvkj2fiHmLAE6ocHtipmO8+Xy+Y9B1wIHPAh7G6rFbSjmwVb8= 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 1772634133690992.9176221794377; Wed, 4 Mar 2026 06:22:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn6n-0007xl-Uy; Wed, 04 Mar 2026 09:21:55 -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 1vxn6c-0007ve-2D for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:44 -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 1vxn6a-000685-Mc for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:41 -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-320-3InB1o9TNPG_fzrJnttCYg-1; Wed, 04 Mar 2026 09:21:36 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 DA9D9180044D; Wed, 4 Mar 2026 14:21:34 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 165F91958DC2; Wed, 4 Mar 2026 14:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634099; 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=iBpdYNbW/Xk/UNHoV+Doxxi9hHsYlnHzAUV0ayVujkw=; b=Ch++/h2TDLiUoS7NaGCFu2HShZ5kP8VaTQmpZ++0IVvy+AyZwBKq3da4jebXR+r3gBIc59 6zdpj+T3vh2IWBTA4uhNKPcyVgt/lLReeiLBx8guIy0NF4a828UWibi5VE7HS8g6IBepwI ui/rhc/Jkc103ugUDK5VKjZ1AfudiNM= X-MC-Unique: 3InB1o9TNPG_fzrJnttCYg-1 X-Mimecast-MFC-AGG-ID: 3InB1o9TNPG_fzrJnttCYg_1772634095 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 02/15] tests: print reason when I/O test is skipped in TAP mode Date: Wed, 4 Mar 2026 14:21:07 +0000 Message-ID: <20260304142120.2635617-3-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634135764154100 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634170; cv=none; d=zohomail.com; s=zohoarc; b=gr6PKShZ3QygbL1yL9RrSUl6NIcKreDsuI5SbGo1s4DYgSeD2RUZB2d76s9iTimwjsNq6bPXs3bKA0ouSCbfVUEViSS4XBK0r3ftik7FwlWSgJ0tLHXY21zswCN0LauLNogaQyi2hO/Uw1bdNBJBmxFBdBnEGu9XWhLA2InsXB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634170; 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=0Xje5LaHEO52SnUBcm1rcYMmS4lUtbZOhpCbA84BBdQ=; b=YX88WmIzp61qjLBxyrMUW5knOW4z1dEOh0mxz3qvq9zGypJsjTf81KxrG4mv9abiCZeZFJrhw9VSEd1nwYEnFk003DUrwlhpIyjWLdwhLjc5poeN6EeLRZGOIHMq59atTzSuSUoqX3DJIV8Fv+OObXjjG5GRXhLeHcy0tM9AsIY= 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 1772634170188159.8966288836499; Wed, 4 Mar 2026 06:22:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn73-00084K-Th; Wed, 04 Mar 2026 09:22:09 -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 1vxn6h-0007wt-Gz for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:48 -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 1vxn6g-00069C-4O for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:47 -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-562-z985zNxcNyGsWgs3-eDIBQ-1; Wed, 04 Mar 2026 09:21:40 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 78BC91800464; Wed, 4 Mar 2026 14:21:39 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 73B9F1958DC5; Wed, 4 Mar 2026 14:21:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634103; 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=0Xje5LaHEO52SnUBcm1rcYMmS4lUtbZOhpCbA84BBdQ=; b=UAY32r5DI+tna6VQWPxh5StU7duSRTt5E0zMcmRFeb9jMIWz6X/SU/7+z1YOSeot9jM7zt ua6YpFK+rd54bHzymIb6SCkKB7fBa0g8hbbmFYybM5I+TD2FrjaC1PuCz+bIV1qs3Gp9ue yir5rIptgEbys5N0nckA4wYPJt8fvKc= X-MC-Unique: z985zNxcNyGsWgs3-eDIBQ-1 X-Mimecast-MFC-AGG-ID: z985zNxcNyGsWgs3-eDIBQ_1772634099 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 03/15] tests: remove redundant meson suite for iotests Date: Wed, 4 Mar 2026 14:21:08 +0000 Message-ID: <20260304142120.2635617-4-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634171796154100 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. Tested-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634240; cv=none; d=zohomail.com; s=zohoarc; b=bUKVlEcbLCzn4lG1C0hN2eo7Q+lsWzraDlBU2nMNuBswXFnVIs4ZwEqoC5evS6XCLpZQ4PotDW8epeVbh/kFcr6RMBJ4qB2alOe9TJdnnjbTL1rxJOGxbvNJp/D16148cr/eCZwahMjHlHCVJQISci4h+LxSmie3W8OMLjuyb6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634240; 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=tSTjl1rRCQTSLUmPFrvSWqmKYwXSQIbkIncGIVUNYI8=; b=ZntrJKYUXIFOLMf1G5G9w6RFP/ZV+2lGyRJMxq4l6kXIl2a+LhRJErZiJ422Y8Us9+0yWpBISq7Mn8lJXhhOeeaK5hURD88YpiiamcniLtDLkyFfBvGy+64+tRQnHCsrPBV+L1fzqsLHJiLR0v3iHbfljZswkFSHy64pipY8xXE= 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 1772634240273173.8205127033466; Wed, 4 Mar 2026 06:24:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn74-00085l-Qq; Wed, 04 Mar 2026 09:22: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 1vxn6m-0007y5-DG for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:53 -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 1vxn6j-00069j-T8 for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:51 -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-652-5OXvqH_EMrmXorcr0CFGMA-1; Wed, 04 Mar 2026 09:21:44 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 AB91C19560A1; Wed, 4 Mar 2026 14:21:43 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EAE3F1958DC2; Wed, 4 Mar 2026 14:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634108; 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=tSTjl1rRCQTSLUmPFrvSWqmKYwXSQIbkIncGIVUNYI8=; b=XzCVEFAlJEXdEShdm+PIJ0gXGx5AbPpfluthmKDzS5DCUe2nloBehid8WxPA4uQAk6YpH9 m1JBrSDKH0fi0ljzypZ2mnjjhFgj5g4zFuRKvVQ403bLVf2YZWWATOy0RYQ/ro9LQpA1ot ZchItKDifc9L+Dkzp+iAZKIzPN3PcjY= X-MC-Unique: 5OXvqH_EMrmXorcr0CFGMA-1 X-Mimecast-MFC-AGG-ID: 5OXvqH_EMrmXorcr0CFGMA_1772634103 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 04/15] tests: ensure all qcow2 I/O tests are able to be run via make Date: Wed, 4 Mar 2026 14:21:09 +0000 Message-ID: <20260304142120.2635617-5-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634242481154100 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. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634135; cv=none; d=zohomail.com; s=zohoarc; b=HHLSM69zel7CVaw1v9WEkVaVlNTLj+7BQmH+XItagb0WD4ey4Uf/CRRrkuSRYZDcCXrGVDRttbovRmF7zJc6pLOaDoNFP7yZOMOnzrlwzSINEvFSwBZk2KiXU61JF4CA1EbFRivJmPn4O4fe8ivLI3fKA4Pm8CgMlppoYSdqnhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634135; 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=1tyVY+9RbGGWWtSVonpKjtbnK9dfRp81yNB473fze34=; b=SAW4I8Ba4PHh7ZEnk38xhnnvA6gjjcuzy/FGLURhTV1bxv5lw6wzM5z3sDXWTGVVVxo2gugr6uIRYbJOEffd4oU6igJV5eT81frDX+7yEP2mD9Se8K3lItr1ptzBILoKtElKsMV9cu8tSYCW12H2PPNiRymaXDcb8RsaKKNAuyU= 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 1772634135679618.9672343753649; Wed, 4 Mar 2026 06:22:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn78-000881-E5; Wed, 04 Mar 2026 09:22: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 1vxn6o-0007yq-Gj for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21: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 1vxn6n-0006A9-1R for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:54 -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-43-vg_VmLOPMKG9a_T-fd5GBQ-1; Wed, 04 Mar 2026 09:21:49 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 49A8D195605A; Wed, 4 Mar 2026 14:21:48 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 35B1E1958DC2; Wed, 4 Mar 2026 14:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634112; 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=1tyVY+9RbGGWWtSVonpKjtbnK9dfRp81yNB473fze34=; b=ONGr8tRQPi/0mNEUNNV0SohaPpUbenkb5fCrUHQ7gOznp607PGRhE1FY8lXxb0ADnNUuxx wi1qC2ZtpRBl1yfG/X9i1xaB/47+4zDMCQ9VtGqD06cJi95GObt6EbZ0EzQQYI4qL4uLbN Fgn4IN8oHgZU+kb7xuXcit4cJRSW3+o= X-MC-Unique: vg_VmLOPMKG9a_T-fd5GBQ-1 X-Mimecast-MFC-AGG-ID: vg_VmLOPMKG9a_T-fd5GBQ_1772634108 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 05/15] scripts/mtest2make: ensure output has stable sorting Date: Wed, 4 Mar 2026 14:21:10 +0000 Message-ID: <20260304142120.2635617-6-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634137509154100 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. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634153; cv=none; d=zohomail.com; s=zohoarc; b=HmIM1D8Mhyy8wTtQPJDMAJDYsj2bd+xXWyuM1u0B1cY5TPJNC5TP+eZjMFCRmklDX6GWLVgP1n80dbrcyn6VMQA/aC4No5d9NejXBd5eCoehX7E95ooLPvEsDY7uX3GMmNBNSgC0RsSjoAP79YMmZ8oI3BOpifodxZDEu/yapU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634153; 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=VnI1RDbgdvo404hxXw3xEguMYroCOb9KqKhMBQ7BDM8=; b=aqXAD9I7zXYGARcDb4STvhrzpSyeQggb+pLOWqqYkNPMgo3hXrY3TnJsY+BuEE/KzhWsDDidicAYPk6c79uJZysUQQOVUxDM+JXsk4XDHo+d8dRqHHMT/70CrvRhkp63ySK+YjcSvCb/PevH8qmZPujdgcRH1H4ojLLwDdeg3XA= 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 1772634153546945.3499777927289; Wed, 4 Mar 2026 06:22:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7H-0008VS-De; Wed, 04 Mar 2026 09:22:24 -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 1vxn6t-000825-R4 for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:00 -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 1vxn6s-0006An-9i for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:21:59 -0500 Received: from mx-prod-mc-01.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-65-ZtHl6qkfO0uOna1saw96xQ-1; Wed, 04 Mar 2026 09:21:53 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 943591956095; Wed, 4 Mar 2026 14:21:52 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BC0241958DC2; Wed, 4 Mar 2026 14:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634116; 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=VnI1RDbgdvo404hxXw3xEguMYroCOb9KqKhMBQ7BDM8=; b=XxKiP6Sr1NXHF5c0RM54UsjXjeASp+ewcIUaXbpxduRWREwnYVMxUWTEj6sTWFkIrBQkEv CyTYiCV3+YFAqGudkKJ5TMdpYVtJFJZWjxj5dTRlQ2ocgwQs6J52aWaCCru/YvmpJOE81k s4hU5MXmwLSoN890WZ3QugYWXevQf8Q= X-MC-Unique: ZtHl6qkfO0uOna1saw96xQ-1 X-Mimecast-MFC-AGG-ID: ZtHl6qkfO0uOna1saw96xQ_1772634112 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 06/15] scripts/mtest2make: support optional tests grouping Date: Wed, 4 Mar 2026 14:21:11 +0000 Message-ID: <20260304142120.2635617-7-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634155855154100 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 variable, 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634174; cv=none; d=zohomail.com; s=zohoarc; b=Yh0JUVlKPL//eFtAaPqkmBaNJ7ghV1fW2WIAfTGd1VgxvbLYfIOUYcNezLvHQs9bvfa95afvnKGgNkdgb3xkC2RoBLSBdsMlUnmZj12tnSAqcV+R56z/GBv1z1F0cewRAMhXHRpX+4akLYWkwPOwbI+q1+w0srKwG7PsAsXh7ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634174; 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=bZGhitS9/tFNn+lON4YJ0r/JYsLmguosRzmtEOjaQb0=; b=lAf7JcdeIwHkn/3ujQsx4HhCgu61OlyiuHLdTbkbVDffg+TcnRlRc4CN5AO8J2/Eg1YDUEUEvLHR+jzr16uDoCJQndinUwSq56gNKN/uGqsMNMAV6r8g5gg0VQVZdSX+i78Xdr5+5IevVrAlfSdqWe1gbPffPJPdTvWAyxbjDOM= 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 1772634174648366.93337515883286; Wed, 4 Mar 2026 06:22:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn79-0008F5-TP; Wed, 04 Mar 2026 09:22:15 -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 1vxn6x-00082Z-7y for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:07 -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 1vxn6v-0006B3-Hj for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:02 -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-461-_DsSQvF5OU-lxksTrbsBUg-1; Wed, 04 Mar 2026 09:21:58 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 BAAE71800281; Wed, 4 Mar 2026 14:21:57 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2E75F1958DC5; Wed, 4 Mar 2026 14:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634120; 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=bZGhitS9/tFNn+lON4YJ0r/JYsLmguosRzmtEOjaQb0=; b=SQst1nRszen5ya6YSnseuVhp59HXuE3CnVDVHF6xHxt/KA2DbgGkOtfFq5LU/yT0FPR1ay xPtH5T+0nxYVk3kWixIDgFzjZNm7j2n2B077frIh/2scJJNOWAooTob46yP3vh4AsWcH7i u84ZhX41IL90SpHp40hAU3PMHDvgKAQ= X-MC-Unique: _DsSQvF5OU-lxksTrbsBUg-1 X-Mimecast-MFC-AGG-ID: _DsSQvF5OU-lxksTrbsBUg_1772634117 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 07/15] tests: add a meson suite / make target per block I/O tests format Date: Wed, 4 Mar 2026 14:21:12 +0000 Message-ID: <20260304142120.2635617-8-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634175844154100 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 59b9a4b922..53f47972a3 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 tes= ts" - @echo " $(MAKE) check-block Run block tests" + @echo " $(MAKE) check-block Run block tests (all format= s)" + @echo " $(MAKE) check-block-FORMAT Run block tests (only for F= ORMAT)" 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634169; cv=none; d=zohomail.com; s=zohoarc; b=NkifFRFPr8WLSBxFKrmPFsnpPJ0QEZA23IuOH/U5pXm6KdVkju1me23Ox+R6CK0/rLdhlwV7f5Y5gC0vsJJry/unQE56F9BJ7DLTfQNpzOsMUEgz2hdeXECSrKYOe+Sw5btuUIlf8406BABUCaBGQMGQs+cCUctJftL5djh/0Mw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634169; 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=MndI2TDLfJqvtsbee96/8Sl0n8ieTPjrzvQ8vfGF7Jw=; b=l6OLCMJh1rXs+duFVQ49xqKuUS3kilDtPirtrPEToBuY0rr1PFinBzikX9q+ec+i5etBuKauwsp2aR+F3FwNE87UpxQbkkx5nsNmcOoKswLhh2ucNejLGAwUDbah890OVdmcqTe5dwDOGhRq/+M5JQXPxNTuBXpdIcfhFA44Vjk= 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 1772634169952147.68760604651993; Wed, 4 Mar 2026 06:22:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7H-00005s-Iq; Wed, 04 Mar 2026 09:22:24 -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 1vxn72-00084U-BG for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:08 -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 1vxn70-0006BW-R8 for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:08 -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-225-5eIfAhJRNYa49tapWI84xA-1; Wed, 04 Mar 2026 09:22:03 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 1759719560AE; Wed, 4 Mar 2026 14:22:02 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6A9C31958DC2; Wed, 4 Mar 2026 14:21:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634126; 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=MndI2TDLfJqvtsbee96/8Sl0n8ieTPjrzvQ8vfGF7Jw=; b=fMxdGTJoasd6DvDwvFBuP40w6JFLF/7z+KwElZyWJyl8Mq9CMflXOmG5b04ZAG7fqCt+LH gTvH1kQ2l34q+/vnWgogDAtiTcSDYue02IA7I/IjKd0l/FgJkKLWmkp6uTNZNNSEKREkPC ZdXBew1CibfQTiCpNHy+QXNpeNho/FQ= X-MC-Unique: 5eIfAhJRNYa49tapWI84xA-1 X-Mimecast-MFC-AGG-ID: 5eIfAhJRNYa49tapWI84xA_1772634122 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 08/15] docs/devel/testing: expand documentation for 'make check-block' Date: Wed, 4 Mar 2026 14:21:13 +0000 Message-ID: <20260304142120.2635617-9-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634171820154100 Explain in greater detail what 'check-block' will run for each format, and also document the new format specific targets. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing/main.rst | 25 ++++++++++++++++++++++--- tests/qemu-iotests/meson.build | 2 ++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index 0662766b5c..dc4f7202a5 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -221,9 +221,28 @@ 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 the formats +``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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634157; cv=none; d=zohomail.com; s=zohoarc; b=Tvx6lUQqY18FGTDQbcGjTAkTW0mdEIg9gTGKClh5zPJNX7hU8etrCHysnChnJbacePTbGNA+RuKTLK0VAVrrg/hGSU/8oeM2mMzD7KMQ1VOaiWSEMYHgFUb63Ib4nh6QPR8mmVnNrMBoQFJxatbOVyigIz3V6RPaE5HI2JOkHqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634157; 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=u58rqqjSwW4ZAsEvFXTndNcJ1HxLc1FrNFefqi5p4HY=; b=Fwuhwic+cXtlfBrKxlSQUAUhuQlPk+W8o3WI8ntlDrbY9p6ZTsVIAaUq4zftgdxorCz3n6/DtOyNSWbP5Ew1B8zHbCb2yP1WeO5yQqP7wceRq/xQdIjEbJ7g7WBx84jvzbUSuY9GvuFOXRHEXvTQ12F0SeeqSZjw2SQOiucsx+4= 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 1772634157379574.7679053421886; Wed, 4 Mar 2026 06:22:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn79-0008Ev-Rt; Wed, 04 Mar 2026 09:22:15 -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 1vxn76-00087h-C8 for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:12 -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 1vxn75-0006CK-2k for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22: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-333-vQHtJA1nPTiGEvA1AYnbBg-1; Wed, 04 Mar 2026 09:22:07 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 4786819560A1; Wed, 4 Mar 2026 14:22:06 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 955031958DC2; Wed, 4 Mar 2026 14:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634130; 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=u58rqqjSwW4ZAsEvFXTndNcJ1HxLc1FrNFefqi5p4HY=; b=OOhtg5USjO0IJ39dY40qu2SU+8n22GaPIpBE44QoU0Lx8QbIFm10ZDtLfp0muJOj7/tbfK YP3FwtIVA0ERneWRtysZpGK/b7x8K3tG2Qwu0UVqY82xdJWQ2i6ivRZoAW3SdceTq5SuJD yC27KDbmbDms7Ld1ezLKDmTI0N8OWWA= X-MC-Unique: vQHtJA1nPTiGEvA1AYnbBg-1 X-Mimecast-MFC-AGG-ID: vQHtJA1nPTiGEvA1AYnbBg_1772634126 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 09/15] tests: add nbd and luks to the I/O test suites Date: Wed, 4 Mar 2026 14:21:14 +0000 Message-ID: <20260304142120.2635617-10-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634159784154100 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 dc4f7202a5..8067d0a3ed 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -233,8 +233,8 @@ 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 the formats -``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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634245; cv=none; d=zohomail.com; s=zohoarc; b=SfevIQupnXc7QoPOR/wLhZ2r4V1XZjOpKi5U6F0DZSsr+QXh0fiR90wJ0yBnPwbwxq5ubCZW39Eer+QeaSV9DXxi1xTPU+5viOYY6I4k0bHPXo2z1R+OP4IyyxVAHci1wJtWjHIOfdgV23xI3SY7F94Hd1yUO9BYanGLUFDJQk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634245; 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=QiEhpZCrgNbz8msv8hZ3ATueUltWVmjH+otMAUblj1M=; b=KC8dnWK8DBrPRF5un5Ix6nkgsT5lA8dRpBMQkYfd7UZJkLOP8aka1qgH2kCplHbYF2B1eGrLeZuD2voQnbNqT3cv2HTlYLos+NHaOClfRAxFk7zzg1Vzxtatb3p5hd22ZUOWHGXuzsm9eHbKqFjdt/ubuX59jBCuiTDyjKWf5A8= 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 1772634245023529.7439822725094; Wed, 4 Mar 2026 06:24:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7P-0000Bj-A0; Wed, 04 Mar 2026 09:22:31 -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 1vxn7B-0008JP-1N for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:19 -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 1vxn79-0006Cr-CP for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:16 -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-540-qVy1llOLORipHe7RIcjOKA-1; Wed, 04 Mar 2026 09:22:11 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 98F301956096; Wed, 4 Mar 2026 14:22:10 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B89F61958DC5; Wed, 4 Mar 2026 14:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634134; 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=QiEhpZCrgNbz8msv8hZ3ATueUltWVmjH+otMAUblj1M=; b=DOOV4OBc85FPUFL4tp5nUghOL2yR6DKmRKgsjf5vEzC84yIsrrh2G1QXlR3R/WhyT8rvEO dbBMuBRWOmMaYegR2uMPpgr0dA+anCBYPpG7iHK8RhIZbRJNlXdUNZMYj664c8pEwRnwcH RnV/16PL6R7KlU8COY6Hz1YJhnYBioU= X-MC-Unique: qVy1llOLORipHe7RIcjOKA-1 X-Mimecast-MFC-AGG-ID: qVy1llOLORipHe7RIcjOKA_1772634130 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 10/15] tests: use 'driver' as collective term for either format or protocol Date: Wed, 4 Mar 2026 14:21:15 +0000 Message-ID: <20260304142120.2635617-11-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634246675154100 The I/O tests integration previously exclusively tested block formats and now also covers the NBD protocol. Replace references to 'format' with 'driver', as a generic term to collectively apply to either a format or protocol. Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing/main.rst | 13 +++++++------ tests/Makefile.include | 4 ++-- tests/qemu-iotests/meson.build | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index 8067d0a3ed..797111009a 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -222,7 +222,8 @@ check-block ~~~~~~~~~~~ =20 There are a variety of ways to exercise the block layer I/O tests -via make targets. +via make targets for a selection of formats / protocols (collectively +referred to as ``drivers`` below). =20 A default ``make check`` or ``make check-block`` command will exercise the ``qcow2`` format, using the tests tagged into the ``auto`` group @@ -231,14 +232,14 @@ 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 the formats +drivers. The most comprehensive test plan can be run by defining +``SPEED=3Dthorough``, which enables all available tests for the drivers ``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 -the designated format and does not require the ``SPEED`` variable +Each of drivers also has its own dedicated make target, named +``make check-block-$DRIVER`` which will run all available tests for +the designated driver and does not require the ``SPEED`` variable to be set. =20 See the "QEMU iotests" section below for more information on the diff --git a/tests/Makefile.include b/tests/Makefile.include index 53f47972a3..852c01e97b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -14,8 +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 tes= ts" - @echo " $(MAKE) check-block Run block tests (all format= s)" - @echo " $(MAKE) check-block-FORMAT Run block tests (only for F= ORMAT)" + @echo " $(MAKE) check-block Run block tests (all format= s/protocols)" + @echo " $(MAKE) check-block-DRIVER Run block tests (only for f= ormat/protocol 'DRIVER')" 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 744d0b6e88..5d6b0b5ed9 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -12,7 +12,7 @@ qemu_iotests_binaries =3D [qemu_img, qemu_io, qemu_nbd, q= sd] 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 { +qemu_iotests_drivers =3D { 'qcow2': 'quick', 'raw': 'slow', 'luks': 'thorough', @@ -33,8 +33,8 @@ endforeach =20 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' +foreach format, speed: qemu_iotests_drivers + # Drivers 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' --=20 2.53.0 From nobody Sat Apr 11 23:08:18 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=1772634213; cv=none; d=zohomail.com; s=zohoarc; b=XGFRSSEPBcD72WFemPmrjxHTyH9y9QO+DCRfX7wTi6e6DSrUqUlViUF2bq71+fRuevvhfuqSJWUye+yZDm3G8SJ+iZYdM1mZuTBM7saiPDBtWMBlNQ8U23X7Qb+cg3Fj3StAhq8wj0Bv5ay3Mgq6X4CWeNMYRHxk3OFkwEmpWkM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634213; 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=OKRREkYegjD+G7LNIOBAllxrhyvcbD7V3k0kZyhHM+8=; b=YrgZlM4ePmjbJcqDNSa1r5tObl2IPDlkNXqrBdJ//bhlI1P9WW7JSRCyZkre9KTHyAZFufhtYiHG3IB6v0jN6rLHLxoaeQW7gZPEtnOPyh+0eFwBClDS2SxlYZ2jiyyzVlxC9MQyoIKCpeVziOdFzC9/yOzB59sbhFNux3DbiZQ= 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 1772634213779851.3554585189582; Wed, 4 Mar 2026 06:23:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7R-0000Ox-Bc; Wed, 04 Mar 2026 09:22:34 -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 1vxn7G-00005t-AF for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:23 -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 1vxn7E-0006Eo-Rz for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:22 -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-189-41_7TYaOPhaiCI4dkdQYXA-1; Wed, 04 Mar 2026 09:22:16 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 ECA7B1800611; Wed, 4 Mar 2026 14:22:14 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 33C971958DC5; Wed, 4 Mar 2026 14:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634140; 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=OKRREkYegjD+G7LNIOBAllxrhyvcbD7V3k0kZyhHM+8=; b=clu8/jnv97MzqebAPkaL2DaX393xLEFr+FU6Xzuw4/wOnSCoSX18XhyQmqwJu9dF54BC04 Rm/b4zQ1lRwsxjBZL41H9Itv2y97VAiVcJD5Q8iyQEj/A6VnOa67cDNha5FVdr0K23WQAP /9RWYYgyItBQO8sc5H4B3AHLeoDg81g= X-MC-Unique: 41_7TYaOPhaiCI4dkdQYXA-1 X-Mimecast-MFC-AGG-ID: 41_7TYaOPhaiCI4dkdQYXA_1772634135 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 11/15] tests: validate dmsetup result in test 128 Date: Wed, 4 Mar 2026 14:21:16 +0000 Message-ID: <20260304142120.2635617-12-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634216268154100 The I/O test 128 uses 'dmsetup create' to create a device, optionally using sudo to elevate privileges. This dmsetup command works in GitLab CI, however, the test then fails with a missing device name: 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) It is believed that this is due to the build env using a manually populated /dev, such that the device mapper node won't ever appear. It is not a race, since a test adding a sleep did not result in the device appearing. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/128 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index d0e00d24b1..d75b1a451a 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -42,6 +42,12 @@ _setup_eiodev() echo "0 $((1024 * 1024 * 1024 / 512)) error" | \ $cmd dmsetup create "$devname" 2>/dev/null if [ "$?" -eq 0 ]; then + DEV=3D"/dev/mapper/$devname" + if ! -e $DEV + then + _notrun "Device $DEV not appearing" + fi + sudo=3D"$cmd" return fi --=20 2.53.0 From nobody Sat Apr 11 23:08:18 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=1772634184; cv=none; d=zohomail.com; s=zohoarc; b=UU/5dto0wRnbwho6yT7r/bCqBS8NkIL/myHPx0y7k1Jf1JFSTB8XFYzquf39wpkRfLIa3nR3oio6A0Sp9rInf/+CRocSdo4/gOcKt0AyJyvZVNTTKzJI0aDyef1Y9HQdIJCez0A5JIMfBh1fpcmzCpUkoZlUb8u1PVYd8YZCWrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634184; 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=dSyY2gs17CHbTM/spZ5TzyaOpGRwJyz45XfDOslDrhU=; b=bsTAj26CgHLHUp58Its/3bXI7xUixbdPrCU/Dn3G9Sg9Fl7ET/QIgMwVqmIQMp3TcgBaIKZjCk/0521dLa2K/PO0LqGckENH8lM7HFKGFP3599v9Bd7jqUruzKf6bcHkFVUlwSBp1EeuMNx+evWu1xylEKA7JXX4B2QIV2noS6c= 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 1772634184426233.24063695470204; Wed, 4 Mar 2026 06:23:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7S-0000SJ-Lp; Wed, 04 Mar 2026 09:22:34 -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 1vxn7J-00008V-Fg for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:26 -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 1vxn7H-0006FS-W4 for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:25 -0500 Received: from mx-prod-mc-01.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-425-OMTzS4F8OrWdjjEE9IoQyQ-1; Wed, 04 Mar 2026 09:22:20 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 187801956094; Wed, 4 Mar 2026 14:22:19 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6D7B01958DC2; Wed, 4 Mar 2026 14:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634143; 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=dSyY2gs17CHbTM/spZ5TzyaOpGRwJyz45XfDOslDrhU=; b=LtHhfeP/bHs90570CmWBt/Go73K1PpuSQI90Ql+2lkgKNm6+lblK9+P0q2ga0262hfr17T 0kzEPJksgQFsQwVU4GZPkKtE9feXByzi1qE6Jqm9mc+ZrJQHnuIC19TXWCC2iggrg/1zVw mCM2Dw1x0Cy8l2R0DWtEEy1AAVMgqrM= X-MC-Unique: OMTzS4F8OrWdjjEE9IoQyQ-1 X-Mimecast-MFC-AGG-ID: OMTzS4F8OrWdjjEE9IoQyQ_1772634139 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 12/15] tests: fix check for sudo access in LUKS I/O test Date: Wed, 4 Mar 2026 14:21:17 +0000 Message-ID: <20260304142120.2635617-13-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634185923154100 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'. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634212; cv=none; d=zohomail.com; s=zohoarc; b=HeKleekqmVjl0wzR3FYklbyWI1YsruaxLS6Dh3w4XIKdb3RI5M/UWu/yoQqAM+1Jh+RCLWuUTCA/9qh3QuRfVX7zIjQTfTMymYP9URxIW66j1BK7BhxZeDx3z8NRTrw74XoUvyDUe0mb4TSyHIc6bFstob2q2ReFK0wdeXYNbQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634212; 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=ujhNceZbLZrk0rqVrTeJI7/TEiCjUeSwasyi8BpHUyw=; b=mBQsRedciX5pFQmBdLE6eySja3wr9nSQ2eKfawWglpHXA1KvuOhnIhTdSnuGkibOYTqlbiZ+Mgcg+ctU/8He4vQF/yqRIHgACFRWDO5+ddpCNresGXnuoe/1R1EYvA0FXMEeZVFrjisYWwz11eb4KIpWoWlnsaBMdWT8zJFBK9Q= 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 1772634212920101.39272244991184; Wed, 4 Mar 2026 06:23:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7U-0000fW-DN; Wed, 04 Mar 2026 09:22:36 -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 1vxn7O-0000G3-Tk for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:31 -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 1vxn7N-0006KE-J4 for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:30 -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-340-htS10chqOW-lIj_6BoyTrQ-1; Wed, 04 Mar 2026 09:22:24 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 A24E219560B7; Wed, 4 Mar 2026 14:22:23 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AE0F21958DC2; Wed, 4 Mar 2026 14:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634149; 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=ujhNceZbLZrk0rqVrTeJI7/TEiCjUeSwasyi8BpHUyw=; b=Z9NV2lt5Z50wYBqo/1D4aWvflnst7+Gr8TDPDNPItGoK1EzuyYqY2jinR0SGTSPsXRbkhk 0D2zcTIwaGvLfGPRHG/SRXtC/QpFeaf+kSO3pHBb8+UkZu5xYaV9BK4o1M5ZuzYsPP86HR 2Fb5WBGPY6Znp/8kKZsAoHpz3zkAmI4= X-MC-Unique: htS10chqOW-lIj_6BoyTrQ-1 X-Mimecast-MFC-AGG-ID: htS10chqOW-lIj_6BoyTrQ_1772634143 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 13/15] tests: add QEMU_TEST_IO_SKIP for skipping I/O tests Date: Wed, 4 Mar 2026 14:21:18 +0000 Message-ID: <20260304142120.2635617-14-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634214241154100 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. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- 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 797111009a..f779a64415 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -284,6 +284,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 ``149`` 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634233; cv=none; d=zohomail.com; s=zohoarc; b=km08CFFp6g29bcQWdE7A8+EPitxghgLjFkAiejGPf4Y/IaWTSDLKFt2z8AhjKo10OaN9ATG+K45JeZ6445/Fv3lmjkecA4EbHT4CxVgS2Lq00GWrrfeRSmbzrMtCxMWrBa7pNa2RKFYS4CJTDjscQoNRtSUECWSqyeBZ0iXYGl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634233; 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=S2pUvMQewJUV9LL6jjoOnTx3CSBNxygEpDicbyvLHxs=; b=khLuCgoudWEn7hPqhvGv7ALsD/A6imQVSlynJnC4kuCrSbBccH94lAOhNY8OqJO5hH3LzyPAggwe1aIliUGaBV6a6O+akzoVaOnW76sXEOvWi/QdZoUA5lfa9ePLDLvSCy6ueq9/CgA1IrfrClItgD77PfVVwZxyciudkmuMn98= 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 1772634233136737.0464079739049; Wed, 4 Mar 2026 06:23:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7V-0000mk-U0; Wed, 04 Mar 2026 09:22:37 -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 1vxn7U-0000eY-5o for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:36 -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 1vxn7S-0006Ko-6k for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:35 -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-558-horikHwyNoObpUFkiDft2Q-1; Wed, 04 Mar 2026 09:22:30 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 BBCDA19560B5; Wed, 4 Mar 2026 14:22:27 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1EE361958DC5; Wed, 4 Mar 2026 14:22:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634153; 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=S2pUvMQewJUV9LL6jjoOnTx3CSBNxygEpDicbyvLHxs=; b=EE4CKkIQSs3HbObbx01WbRPuatSUUf2OEnObTypbnQotNWyFuCySrD1fl7CxWz1N4n508C z6TVH0GphvDdwhRop/Z3ZhFkgmrEDbYaS2I/dSV/cDnDCAXBXGGsZSPgv5KEzN0xmk8FP8 MzJCMejb+gQAXJqGD06D3cAlSgQczlc= X-MC-Unique: horikHwyNoObpUFkiDft2Q-1 X-Mimecast-MFC-AGG-ID: horikHwyNoObpUFkiDft2Q_1772634147 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 14/15] gitlab: add jobs for thorough block tests Date: Wed, 4 Mar 2026 14:21:19 +0000 Message-ID: <20260304142120.2635617-15-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634234634154100 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. The 'centos' image is used to run the I/O tests since several tests have an implicit dependency on x86_64-softmmu, and thus break with other architecture targets. The 'centos' build job is the only one that creates the x86_64-softmmu target in CI. Ideally this target portability in I/O tests would be fixed to avoid this limitation. 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 The jobs 147 with NBD and 045 with raw are also marked skipped as the qemu.qmp python code triggers deprecation warnings for sendmsg. This can be removed when the next release of python-qemu-qmp is made per: https://gitlab.com/qemu-project/python-qemu-qmp/-/issues/36 Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest.yml | 102 +++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 4b20429c7f..2e143737a3 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -174,6 +174,108 @@ build-system-centos: x86_64-softmmu rx-softmmu sh4-softmmu MAKE_CHECK_ARGS: check-build =20 + +# NB: block-XXX jobs use 'centos' since that is the build +# job that provides the x86_64-softmmu. Some I/O tests +# are currently buggy and blindly assume characteristics +# of x86 (such as PCIe) causing failures with other arches + +block-luks: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-luks + +block-nbd: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-nbd + # https://gitlab.com/qemu-project/python-qemu-qmp/-/issues/36 + QEMU_TEST_IO_SKIP: nbd:147 + +block-parallels: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-parallels + +block-qcow2: + 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: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-qed + +block-raw: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-raw + # https://gitlab.com/qemu-project/python-qemu-qmp/-/issues/36 + QEMU_TEST_IO_SKIP: raw:045 + +block-vdi: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-vdi + +block-vhdx: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-vhdx + +block-vmdk: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: check-block-vmdk + +block-vpc: + 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.53.0 From nobody Sat Apr 11 23:08:18 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=1772634255; cv=none; d=zohomail.com; s=zohoarc; b=A4u55GLAlJg1KRpz2AWXw4cIf19taqKVesijpLjlcLoyZ6eSJIaTosmSUHIV8clrW4/nOJZhMpkv0hbd06X8u9kYTXhy2H2S0rRI3rur/6dpKZm9jNEHJq0FJBhCNWHmnUjwAm3TpLnqS9yIeukn7shaLpJqzDfmWvqlAfTfoUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772634255; 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=iReeKHpTuROWrqxXbiGEEtT2dB3u506kUvBAm1b6zBY=; b=gfEU3iZEeak8Ux4bUDn1pcyegk6hZj+Bat36yFGvscnmm/R1yvkCGB8w29fYAC/bNCRckim3gQEtbSx8g6NiFBkGWB4e9yT68bD3WczElv9hAoDG0HWisywiogC4Qo8Rv5RYBjH6nHCk0hzsmqpYsJJs/YSeNl3EgYUBmtR8sZQ= 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 1772634255474641.67785370465; Wed, 4 Mar 2026 06:24:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxn7X-0000pO-J1; Wed, 04 Mar 2026 09:22:39 -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 1vxn7W-0000oI-AB for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:38 -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 1vxn7U-0006LZ-UI for qemu-devel@nongnu.org; Wed, 04 Mar 2026 09:22:38 -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-573-br9kE1ZyNsyPg8JMmajvEg-1; Wed, 04 Mar 2026 09:22:33 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 F3E24180034E; Wed, 4 Mar 2026 14:22:31 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.34.75]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4CEBA1958DC2; Wed, 4 Mar 2026 14:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772634156; 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=iReeKHpTuROWrqxXbiGEEtT2dB3u506kUvBAm1b6zBY=; b=iBzVwoaWmAAWWr9jqJq/p3URi6Ki64CqQ80SoPEqzPgMQlF/u9zM0ki0ftEjCYCzlop3gY +ojmi+vt+S2pmLBzkIG2DqZ3aG1hjkiMh/DPhh1dXitmBLorgRtzoGorHM0XttKl16tUK/ 82MJJPsGfFQm06zb92U6MH00KgD1BKU= X-MC-Unique: br9kE1ZyNsyPg8JMmajvEg-1 X-Mimecast-MFC-AGG-ID: br9kE1ZyNsyPg8JMmajvEg_1772634152 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , John Snow , Kevin Wolf , Paolo Bonzini , Cleber Rosa , Hanna Reitz , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v5 15/15] gitlab: remove I/O tests from build-tcg-disabled job Date: Wed, 4 Mar 2026 14:21:20 +0000 Message-ID: <20260304142120.2635617-16-berrange@redhat.com> In-Reply-To: <20260304142120.2635617-1-berrange@redhat.com> References: <20260304142120.2635617-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.0 on 10.30.177.12 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: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772634256524154100 Now that we have dedicated CI jobs for running I/O tests on each supported format/protocol, we no longer need to special case a run of a hand picked set of tests in the build-tcg-disabled job. Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 2e143737a3..30fd87c597 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -450,15 +450,6 @@ build-tcg-disabled: - make -j"$JOBS" - make check-unit - make check-qapi-schema - - ./run tests/qemu-iotests/check -raw 001 002 003 004 005 008 009 - 010 011 012 021 025 032 033 048 052 063 077 086 101 104 106 - 113 148 150 151 152 157 159 160 163 170 171 184 192 194 208 - 221 226 227 236 253 277 image-fleecing - - ./run tests/qemu-iotests/check -qcow2 028 051 056 057 058 065 068 - 082 085 091 095 096 102 122 124 132 139 142 144 145 151 152 - 155 157 165 194 196 200 202 208 209 216 218 227 234 246 247 - 248 250 254 255 257 258 260 261 262 263 264 270 272 273 277 - 279 image-fleecing - make distclean =20 build-user: --=20 2.53.0