From nobody Sun Feb 8 22:58:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768250628; cv=none; d=zohomail.com; s=zohoarc; b=Or6GXvIXa2jhFh/iJrk3Lw7jUDmEevfMKi9tSIR5FFVrHlOEdMepDNUCTOpnWWEVASuW432zXVZJfHzjuO2yYqqQXLFUVPUL87QoJkIsKDs23JKX5s/CJmStrywvhKGULxEuZsC379CY81PpvVD6bnkgM8w1cSfatPrXYsozyxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768250628; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GxfQ8+uJRBHSX3Q0kai+sJg8CqXlMf/0CxzYd5JE134=; b=Rr0If+O+6JQrRxlZXdhy7w/do6pgeRel2qPjSZS0JrNut2V5+IBlM9FIN8VkVk9fYGBi23zlyn1iMQcsgTlL6fuwxETTxP42D8v8z3xalOIY6TT6oseHVIHHFtPm5DtC4bp5y/wDESryLuTRGmMTDvP+JmX4bwIHl39t8bo/i8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768250628411571.8566498416575; Mon, 12 Jan 2026 12:43:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfOij-0007GK-4J; Mon, 12 Jan 2026 15:41:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOig-0007EV-UU for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfOif-0000n7-He for qemu-devel@nongnu.org; Mon, 12 Jan 2026 15:40:58 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-nFVx6kqwPJ6CmsNiVh-r3w-1; Mon, 12 Jan 2026 15:40:52 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 819521800365; Mon, 12 Jan 2026 20:40:50 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.178]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B532A30001A2; Mon, 12 Jan 2026 20:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768250455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GxfQ8+uJRBHSX3Q0kai+sJg8CqXlMf/0CxzYd5JE134=; b=g4+4fy3gmFQBAXjjtpkL7xFT248PqQvmtC36Ak8xlH9boOQgOOItJOyfcK6v8fEojKMZBG EHIYqUEra5oA+kTWjW6NUdo9XaUXdXphG0KxgmRWc7Eg2kwPeGgoEdoBM2NtB3Bx5eXxYE lJws9HEUGd3Ub6laSI2ZzbDIxIZDDfo= X-MC-Unique: nFVx6kqwPJ6CmsNiVh-r3w-1 X-Mimecast-MFC-AGG-ID: nFVx6kqwPJ6CmsNiVh-r3w_1768250450 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 06/13] scripts/mtest2make: support optional tests grouping Date: Mon, 12 Jan 2026 20:40:19 +0000 Message-ID: <20260112204026.710659-7-berrange@redhat.com> In-Reply-To: <20260112204026.710659-1-berrange@redhat.com> References: <20260112204026.710659-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768250629776158500 Currently tests can be classified into three speed groups depending on whether the meson suite name ends in '-slow' or '-thorough' or neither. This gets turned into make targets that match the name of the meson suite, with the speed suffix stripped. e.g. * suite=3Dblock -> 'make check-block' * suite=3Dblock-slow -> 'make check-block SPEED=3Dslow' * suite=3Dblock-thorough -> 'make check-block SPEED=3Dthorough' The set of tests under the "thorough" speed, however, can get rather large and it would be useful to have a way to expose further make targets for directly running a particular subset of tests. This needs a way to run a target without requiring the SPEED varaible, while also not having them enabled by default as if they were 'quick' tests. This modifies mtest2make.py to support this idea by allowing for a new suffix '-optional' on a suite. When this is present, a correspondingly named make target will be created without the '-optional' suffix which will never be run automatically. This is intended to be combined with use of other suites. For example, a single NBD test might be added to two suites, 'block-thorough' and 'block-nbd-optional'. This would allow running it as part of all the block tests with 'make check-block SPEED=3Dthorough', and as part of a standalone target 'make check-block-nbd'. Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/mtest2make.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 915f02d600..383ea68b16 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -22,7 +22,7 @@ def names(self, base): print(r''' SPEED =3D quick =20 -.speed.quick =3D $(sort $(filter-out %-slow %-thorough, $1)) +.speed.quick =3D $(sort $(filter-out %-slow %-thorough %-optional, $1)) .speed.slow =3D $(sort $(filter-out %-thorough, $1)) .speed.thorough =3D $(sort $1) =20 @@ -66,10 +66,15 @@ def process_tests(test, targets, suites): s =3D s[:-9] suites[s].speeds.add('thorough') =20 +def target_name(suite): + if suite.endswith('-optional'): + return suite[0:-9] + return suite + def emit_prolog(suites, prefix): - all_targets =3D ' '.join((f'{prefix}-{k}' + all_targets =3D ' '.join((f'{prefix}-{target_name(k)}' for k in sorted(suites.keys()))) - all_xml =3D ' '.join((f'{prefix}-report-{k}.junit.xml' + all_xml =3D ' '.join((f'{prefix}-report-{target_name(k)}.junit.xml' for k in sorted(suites.keys()))) print() print(f'all-{prefix}-targets =3D {all_targets}') @@ -83,14 +88,17 @@ def emit_prolog(suites, prefix): print(f'\t$(MAKE) {prefix}$* MTESTARGS=3D"$(MTESTARGS) --logbase {pref= ix}-report$*" && ln -f meson-logs/$@ .') =20 def emit_suite(name, suite, prefix): + tgtname =3D target_name(name) deps =3D ' '.join(sorted(suite.deps)) print() - print(f'.{prefix}-{name}.deps =3D {deps}') - print(f'.ninja-goals.check-build +=3D $(.{prefix}-{name}.deps)') + print(f'.{prefix}-{tgtname}.deps =3D {deps}') + print(f'.ninja-goals.check-build +=3D $(.{prefix}-{tgtname}.deps)') =20 names =3D ' '.join(sorted(suite.names(name))) - targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml' - if not name.endswith('-slow') and not name.endswith('-thorough'): + targets =3D f'{prefix}-{tgtname} {prefix}-report-{tgtname}.junit.xml' + if not name.endswith('-slow') and \ + not name.endswith('-thorough') and \ + not name.endswith('-optional'): targets +=3D f' {prefix} {prefix}-report.junit.xml' print(f'ifneq ($(filter {targets}, $(MAKECMDGOALS)),)') # for the "base" suite possibly add FOO-slow and FOO-thorough --=20 2.52.0