From nobody Thu Nov 20 12:28:12 2025 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=1763461831; cv=none; d=zohomail.com; s=zohoarc; b=ORT16QCYDA//im7+X5oIVmK3J7HgRsx5sCm0QAw2IgbOlETNAY6yzqLZP+nkeb0mH8ErllmmwsisdGfb2RyJZw+kyR/mBL0g4xBJmkzFBsGqkHE4ofQgkzZ1ynVf5Ls2ZjaWgOfrxlFavNFbbM3dV18janOxz5Q6E7R52LW9kas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763461831; h=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=bFbOc8EhCAx8sad0roTMTN9jJAmTdHbS1Y6Z0xIpBBQ=; b=L9LMA6cO8kUcP2sOtvDzx4X4h9whvOrJnpL4ugDyapiNb59ezUHZjjynkUg1fGZwIetLhrAgJaGcPYCipsw3TMvjqBZO3glQDae18yJR1z2mT8tQtU0j94CBsVNG4jplMK/Q38Wg0qOfaV40O7yNoi9oXdZqP7oa+OzdhTvvsGU= 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 1763461831932122.37615064528836; Tue, 18 Nov 2025 02:30:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLIyC-0006U9-If; Tue, 18 Nov 2025 05:29:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLIy9-0006TZ-OK for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:29:53 -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 1vLIy8-00031U-0p for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:29:53 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-321-PguL-nNeNoe6JESt6iLhBg-1; Tue, 18 Nov 2025 05:29:50 -0500 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-42b3086a055so3531709f8f.3 for ; Tue, 18 Nov 2025 02:29:49 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53e7b12asm31198140f8f.10.2025.11.18.02.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 02:29:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763461791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bFbOc8EhCAx8sad0roTMTN9jJAmTdHbS1Y6Z0xIpBBQ=; b=iMX/gupfOaQYbeiatXQX/t7yjO2l4A8P0noFrBb7lYCsTjzHBhuRrHpae1gqHqtATPpNfW nR9SnOLotLBdEMkOPjSP9xpVK8rBDvotXI7SI1FoLOvR4ZMDwMLWLTxGdxlLJ0B1eYK5Qt ZcZf+QT9ytQmoDTkai+IYhV26CTESVM= X-MC-Unique: PguL-nNeNoe6JESt6iLhBg-1 X-Mimecast-MFC-AGG-ID: PguL-nNeNoe6JESt6iLhBg_1763461789 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763461788; x=1764066588; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bFbOc8EhCAx8sad0roTMTN9jJAmTdHbS1Y6Z0xIpBBQ=; b=a++wBfOSyw3YjoPeaWept3AYpv6G6JTjJ8cz1btJc82sgZMsJPKKX/xZ7nhwEj3qCK GhCHzQk6a3j4cBcB31Eh4SF6QOtE0llNEQZWkUwN/lXc001zy82GBTqEy2+a2nOVgaEP 7KMEkoB0AFQXUoiVDP29bpGg9cVRB1LnJl4fcGmb5wjR5mJOnUdRjxGAl8RVOtnM4uVy LHrtWTBvuduribcGhR95ct8u6TeHe/Cj7yA6xrOyaUGixDXkDo/OUlFoFHgh5xvOctCO 2IOXLjD3AEryLxegmBVpVGw+AR9ySvRWQcKutY8ne4I/ja6TtPVJ+lmG0+uTkEsaiY2E YlFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763461788; x=1764066588; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=bFbOc8EhCAx8sad0roTMTN9jJAmTdHbS1Y6Z0xIpBBQ=; b=pHksfz4gqJr4hAkMByWQAjWsM31WzDBSOFdgtvgfUMfRzL/AZfVtl+ttojrhrJRPCa 34QTPbEVSxRVOI/EI5FFn7CFxnMVTG/+kvzGSZFxOdESS57CCB3smd9hFrG/SwWo2tuy ZgwJwuavdN2rtsiVdRAXA1jWjjbkHVjlNakfDUVSj+RaMJee/uzdIS831PfDgfshONO+ aV/VL8eAPNoSELPLWac8z7Enri93rAYofkrpbRUshupz1WoPCv97nmQ8sv+yFAqka4Dg 8VYtIQHkRbc+BUv7BOJjv4rJcaveY7+8PDS0cdn68XyyBenvrOpECALUY+iix0SRSrY8 CU7g== X-Gm-Message-State: AOJu0Yxe82zhbxEmsYYB97qYItUhOLQZ8jcbkOYlim52wPj/BKLXco6o dMMWsBRqkX5lHnluSS26QrEjph5rZ5oyMz93nIAHEo1bHZ+mFA9wFgimelJepS5Ynqf43l9a8ma bELqNZvAB9hmOBhNGlcWev2xpjJsMiSTB3B8Mja4rTDRuDBrF3ozmX7VQJVlRyl/6qohb5kXk9e 5McJWzOBI12M8aGMGYQRWd2D7i3rYharabho5g89BH X-Gm-Gg: ASbGncvLb2iyGcz/4Sqx0ihiYLs8tsiaH4BgsVSJDQKCnsLCPCOqTPvD1J//eZkMZD7 GDQrd7rdKOX/Wp6TDkvtneNaqb1eZ2zz2Hmo0eZgocaSDLhOQejAK8Yljm5aQFUr2VvQAcns2k/ FN2AO64S2DVgdzf053wddKW8tGj92knzN55kV552yxveqbJFk7o3M+g8fA8Yb6H49oT/AyrdgkH VPy/s/G5T0fJ3XIxI5J7rAoQiorInvwtlp1Wm+le4Wl3mWgcc/VzDV6LhBhkjo9+B3lltBmBkKN +u1D3LIGwQQclDUyttHC/I85F7nI+uf4/1O1obcBN71Fjiq5hVVnBwdMEa8gr8YftMTFq1RVbOi 47ubLedwYePf5qk6mag8d72yS8fDVgLbIPpqCqMItZthabZfFZmSSQIw3YnpK3s/ASvCmOgmcId HBile+38wd4LXVMEA= X-Received: by 2002:a05:6000:1842:b0:42b:3dfb:645f with SMTP id ffacd0b85a97d-42b59394e14mr14890715f8f.47.1763461787856; Tue, 18 Nov 2025 02:29:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHxM6umTQhEgZK72WnzEFldINH1o88AssGbXSjfTL0sg5RYDSoBuxcNolXRLh8kjPhcIc4QzA== X-Received: by 2002:a05:6000:1842:b0:42b:3dfb:645f with SMTP id ffacd0b85a97d-42b59394e14mr14890686f8f.47.1763461787387; Tue, 18 Nov 2025 02:29:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, alex.bennee@linaro.org Subject: [PATCH v2 1/3] mtest2make: cleanup mtest-suites variables Date: Tue, 18 Nov 2025 11:29:40 +0100 Message-ID: <20251118102942.551194-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118102942.551194-1-pbonzini@redhat.com> References: <20251118102942.551194-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1763461834759153000 Content-Type: text/plain; charset="utf-8" Remove the "--suite" argument from the .*.mtest-suites variables, and add it only when actually computing the arguments to "meson test". This makes it possible to set ninja-cmd-goals from the set of suites, instead of doing it via many different .ninja-goals.* variables. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e --- Makefile | 4 +++- scripts/mtest2make.py | 40 +++++++++++++++++----------------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 74c2da20372..9fb55dcf330 100644 --- a/Makefile +++ b/Makefile @@ -96,6 +96,8 @@ meson.stamp: config-host.mak =20 # 3. ensure meson-generated build files are up-to-date =20 +ninja-cmd-goals =3D + ifneq ($(NINJA),) Makefile.ninja: build.ninja $(quiet-@){ \ @@ -150,7 +152,7 @@ NINJAFLAGS =3D \ $(or $(filter -l% -j%, $(MAKEFLAGS)), \ $(if $(filter --jobserver-auth=3D%, $(MAKEFLAGS)),, -j1))) \ -d keepdepfile -ninja-cmd-goals =3D $(or $(MAKECMDGOALS), all) +ninja-cmd-goals +=3D $(or $(MAKECMDGOALS), all) ninja-cmd-goals +=3D $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g)) =20 makefile-targets :=3D build.ninja ctags TAGS cscope dist clean diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 2ef375fc6fb..891037e1d66 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -14,18 +14,18 @@ class Suite(object): def __init__(self): self.deps =3D set() - self.speeds =3D ['quick'] + self.speeds =3D [] =20 def names(self, base): - return [base if speed =3D=3D 'quick' else f'{base}-{speed}' for sp= eed in self.speeds] + return [f'{base}-{speed}' for speed in self.speeds] =20 =20 -print(''' +print(r''' SPEED =3D quick =20 -.speed.quick =3D $(foreach s,$(sort $(filter-out %-slow %-thorough, $1)), = --suite $s) -.speed.slow =3D $(foreach s,$(sort $(filter-out %-thorough, $1)), --suite = $s) -.speed.thorough =3D $(foreach s,$(sort $1), --suite $s) +.speed.quick =3D $(sort $(filter-out %-slow %-thorough, $1)) +.speed.slow =3D $(sort $(filter-out %-thorough, $1)) +.speed.thorough =3D $(sort $1) =20 TIMEOUT_MULTIPLIER ?=3D 1 .mtestargs =3D --no-rebuild -t $(TIMEOUT_MULTIPLIER) @@ -34,8 +34,10 @@ def names(self, base): endif .mtestargs +=3D $(subst -j,--num-processes , $(filter-out -j, $(lastword -= j1 $(filter -j%, $(MAKEFLAGS))))) =20 -.check.mtestargs =3D $(MTESTARGS) $(.mtestargs) $(if $(V),--verbose,--prin= t-errorlogs) -.bench.mtestargs =3D $(MTESTARGS) $(.mtestargs) --benchmark --verbose''') +.check.mtestargs =3D $(MTESTARGS) $(.mtestargs) $(if $(V),--verbose,--prin= t-errorlogs) \ + $(foreach s, $(sort $(.check.mtest-suites)), --suite $s) +.bench.mtestargs =3D $(MTESTARGS) $(.mtestargs) --benchmark --verbose \ + $(foreach s, $(sort $(.bench.mtest-suites)), --suite $s)''') =20 introspect =3D json.load(sys.stdin) =20 @@ -72,29 +74,21 @@ def emit_prolog(suites, prefix): print(f'all-{prefix}-targets =3D {all_targets}') print(f'all-{prefix}-xml =3D {all_xml}') print(f'.PHONY: {prefix} do-meson-{prefix} {prefix}-report.junit.xml $= (all-{prefix}-targets) $(all-{prefix}-xml)') - print(f'ifeq ($(filter {prefix}, $(MAKECMDGOALS)),)') - print(f'.{prefix}.mtestargs +=3D $(call .speed.$(SPEED), $(.{prefix}.m= test-suites))') - print(f'endif') + print(f'ninja-cmd-goals +=3D $(foreach s, $(.{prefix}.mtest-suites), $= (.{prefix}-$s.deps))') print(f'{prefix}-build: run-ninja') print(f'{prefix} $(all-{prefix}-targets): do-meson-{prefix}') print(f'do-meson-{prefix}: run-ninja; $(if $(MAKE.n),,+)$(MESON) test = $(.{prefix}.mtestargs)') print(f'{prefix}-report.junit.xml $(all-{prefix}-xml): {prefix}-report= %.junit.xml: run-ninja') print(f'\t$(MAKE) {prefix}$* MTESTARGS=3D"$(MTESTARGS) --logbase {pref= ix}-report$*" && ln -f meson-logs/$@ .') =20 -def emit_suite_deps(name, suite, prefix): - deps =3D ' '.join(suite.deps) - targets =3D [f'{prefix}-{name}', f'{prefix}-report-{name}.junit.xml', = f'{prefix}', f'{prefix}-report.junit.xml', - f'{prefix}-build'] - print() - print(f'.{prefix}-{name}.deps =3D {deps}') - for t in targets: - print(f'.ninja-goals.{t} +=3D $(.{prefix}-{name}.deps)') - def emit_suite(name, suite, prefix): - emit_suite_deps(name, suite, prefix) - targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix= } {prefix}-report.junit.xml' + deps =3D ' '.join(suite.deps) + targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix= } {prefix}-report.junit.xml {prefix}-build' + names =3D ' '.join(suite.names(name)) + print(f'.{prefix}-{name}.deps =3D {deps}') print(f'ifneq ($(filter {targets}, $(MAKECMDGOALS)),)') - print(f'.{prefix}.mtest-suites +=3D ' + ' '.join(suite.names(name))) + # for the "base" suite possibly add FOO-slow and FOO-thorough + print(f".{prefix}.mtest-suites +=3D {name} $(call .speed.$(SPEED), {na= mes})") print(f'endif') =20 targets =3D {t['id']: [os.path.relpath(f) for f in t['filename']] --=20 2.51.1 From nobody Thu Nov 20 12:28:12 2025 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=1763461837; cv=none; d=zohomail.com; s=zohoarc; b=aYth2VnebXPgeh5ZH79Yc7XsdxvmewunzIibA9KKv03f4wjw7bTqcQMTOcPsBzCfsTyfNZC9h+CXQKABjWkU/iBFnWNhfmZ3CZmCH7gjIUvAg73GFFGRBsMyXnxzqnjC/hxO7SWUvMv5aQtXSe+bcW6dHoZDUqOszyrbweD3XkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763461837; h=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=JQ7WlbbczLeQ5KuYJAuJ0aNx+FvO46piSKGnfzlbuF0=; b=O0/AQEQap8GEZXg32/UtyH34QJDWGU2Dw/cG2vRxSSt1efgyf4DDsV1NgTZBvQt5Ebqlg3hTPIiCKLzhLp2GDEI7V42RutAmLUsF5ehA7JAGXAjSv49/mC6lkTPX+ZCDqJv2d+0Toqu5tAg7Zu7V+FFZWw/0jvkE6PfrMKUxBhs= 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 1763461837011756.8395136679367; Tue, 18 Nov 2025 02:30:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLIyD-0006UO-Qz; Tue, 18 Nov 2025 05:29:57 -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 1vLIyC-0006U1-2I for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:29:56 -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 1vLIyA-000325-L1 for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:29:55 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-KJn2PZ18N5OEzt2k_M66JA-1; Tue, 18 Nov 2025 05:29:52 -0500 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4779d8fd4ecso9516325e9.1 for ; Tue, 18 Nov 2025 02:29:52 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477975022ecsm195096735e9.4.2025.11.18.02.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 02:29:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763461793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JQ7WlbbczLeQ5KuYJAuJ0aNx+FvO46piSKGnfzlbuF0=; b=HCtvUKxdgf15MzYTXh3lDq6xHABGboHNW6NIyY2rYxX7xiFjAH7j4hlaZnXEBGXfi1mZ+j 1Wp2Ua9iMOy9TOzQr8vcIOfgUyXpy2d9/sbK+Hw0SthyFrBz8yE8TAtLd4YuUjNpu/jrJh L++kZ9tiuGn4OAGs1qmy8pRTAPH2a84= X-MC-Unique: KJn2PZ18N5OEzt2k_M66JA-1 X-Mimecast-MFC-AGG-ID: KJn2PZ18N5OEzt2k_M66JA_1763461791 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763461790; x=1764066590; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JQ7WlbbczLeQ5KuYJAuJ0aNx+FvO46piSKGnfzlbuF0=; b=APzYpzgwGBw3Q462Hjen6O/nhjomOjbZuce+nKFVckw0NnCDidpXiXT/01CbXoqdxR p+P7EOGDsPTwQ7X1k7n/vsutSSNwTXasgtrUzAUxljE/mPKSOtP2Mi2v0X8zVaQjzW4d tT+/szPl9j/4vVIn1+ibV6I4aQGdLpb6Un4f6YAWbRIYA39kwXoxSK/fXy399OXLtEKD F/8MJLO6Wg6FPNUUy/ajStNtI4yqlx1wh8UmknwSRgPWwZ1PV7xEvu042RrL8XSVk56n +ZpCEePs32MqGfjcUfJeNmXow/+Gvt0Vg9q1f4f45mfBJBoQfWVYglNHb1Pz7Wdsqgcq jZDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763461790; x=1764066590; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JQ7WlbbczLeQ5KuYJAuJ0aNx+FvO46piSKGnfzlbuF0=; b=KBeeHQm8uIXBYWqIAuLz5DTEm7ADLe1xtWhKvd/xZJjase8WtI5196AWX9bmxOgBdz IKjQxv6mG5/OOevyMJqf4kY1I1Y2UGEcOEtwWj0v+48uUS5XVjj6BXTY0GjgeGCTvDyv oD+z/0efnokluKqZi2LBlcEPNZ6atJzJIlf6Ct3gM5Hc/2NQf0p1eHE1UpcQl/OBsYA9 IbS7eCzcv8uKZvQGDfq+UJFjKXEWOmmjKM+Il7SOR8JEFuezwYameXLINaaPmZa3rEI+ DYv51CY2L2LgB4C94U7DXHE6Psqn+PMeW5FT2+ytN3lleXQ9zzAdAcoOaPY/0MgwGx8O j59w== X-Gm-Message-State: AOJu0YyQXkGhjmHPJNV3SqpuHW4awxZ9PVUfvgIGJY7kHYLdBDbvr8Pg rOu3vowY2T1rTLPCBUw4IonqWd6/tnxHTZgMO8RfqJjf11DvtPJLtIm539vlByH3vbgjmLJxD02 AJsIvtvObMe5XneuShSvgQPFXjDkm8V8kSeGd05sWtMZQSc/eiM1W7NN0+yThuaa7IXbchzZ5DR W+R9idw2W7//Ex5Yjei0G/jE39CFyKY9sdGLua4yM+ X-Gm-Gg: ASbGncsnGpq6JE5mEDhlGfqvPtN5aj/uj29YYkCOp9HiZPojriC7y0mabs8ZoK6Xzt1 DMi7B36WsOc90iptUvEF47+Fy+kiAgh1R5eNqFfClcfXmCJeTbgd/GCfLTBZKd1MkyHAhADssJn A4NrQcPAs6dhYc6vrn71u4Jq6+6i52PpRwzeS/9lcfzXTdsV20ou5KN0Kw9McgIDK7wSjmjvcKg p36E9RaN7HbDp/G/J1cwJQCc1FnhxLD+23koqJCFFkBNnAdU/YzLO0p32P5ykfPUWo1bA5N7+u+ gNGe/WQL0T4ek2lQIJg9HIrh1j2J0abSj2Cz44BuiyUst56JeTOLxdaOM5RMzOzEuGQR5ej2nan P6ahDHD3zJjxUxgCczk1pz/huqIRRBGTISm1jx32icNNYywyGBLGwesBCMLz4A3KpT421XQ5RPy xpr/aQXGvCAclwsDQ= X-Received: by 2002:a05:600c:c1c8:20b0:477:a2f7:74de with SMTP id 5b1f17b1804b1-477a94acee9mr18386175e9.3.1763461790138; Tue, 18 Nov 2025 02:29:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IGfm2L9Ud2ilQ45jMnPd163w8ihZ929wj9MA9oF/Qj6Qa+pcNRKVvMsR925j9Vfk97ksQzNMw== X-Received: by 2002:a05:600c:c1c8:20b0:477:a2f7:74de with SMTP id 5b1f17b1804b1-477a94acee9mr18386005e9.3.1763461789725; Tue, 18 Nov 2025 02:29:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, alex.bennee@linaro.org Subject: [PATCH v2 2/3] mtest2make: add dependencies to the "speed-qualified" suite Date: Tue, 18 Nov 2025 11:29:41 +0100 Message-ID: <20251118102942.551194-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118102942.551194-1-pbonzini@redhat.com> References: <20251118102942.551194-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1763461838500158500 Content-Type: text/plain; charset="utf-8" Thorough tests may have more dependencies than faster ones. Dependencies are now looked up based on the suites being executed, not on the suites passed as goals to the makefile. Therefore, it is possible to limit dependencies to the speeds that need them. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e --- scripts/mtest2make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 891037e1d66..692e4867ec7 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -59,13 +59,13 @@ def process_tests(test, targets, suites): s =3D s.split(':')[1] if s =3D=3D 'slow' or s =3D=3D 'thorough': continue + suites[s].deps.update(deps) if s.endswith('-slow'): s =3D s[:-5] suites[s].speeds.append('slow') if s.endswith('-thorough'): s =3D s[:-9] suites[s].speeds.append('thorough') - suites[s].deps.update(deps) =20 def emit_prolog(suites, prefix): all_targets =3D ' '.join((f'{prefix}-{k}' for k in suites.keys())) --=20 2.51.1 From nobody Thu Nov 20 12:28:12 2025 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=1763461837; cv=none; d=zohomail.com; s=zohoarc; b=C5O6ovxIbSKdrTuknhax4i+yFkNJfpNcNNAtgAhm8cWniX45YcznXSETkHCkR/zjpLxaifs16wO3OBV5i7CZ2IIUnJdi83NwUzQgkmMDHCXy2h0tXJVU9xSnpKtn2uwFNU9AMGTgff39F0cIfkR0JHZYQTKDKKpnTHYb3L/GlFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763461837; h=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=do+UbaBiOOwddVkAoLI/+bC2dQuwohtwYVd2EuLCMA4=; b=gP9h6D43Q22fL922yIlFzFWOX4JjWG+zajHHBbkNAG56bOdakeA7NlCOQ3vk1qpWmSJZae2fuXOuzbBHug6uefiFXsJ2tF+uqnl3+GPYMFCGZXNGEns21UJ9xKja+Jh/pvriXEf6oRncHke/r1ZV6ydzFzU+7atYHuAGRNV9SoM= 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 1763461837680906.2682273827262; Tue, 18 Nov 2025 02:30:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLIyG-0006VY-Fs; Tue, 18 Nov 2025 05:30:00 -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 1vLIyE-0006UW-6R for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:29:58 -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 1vLIyC-00032h-P5 for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:29:57 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-168-h73dvMsEOPexueXTj6VddA-1; Tue, 18 Nov 2025 05:29:54 -0500 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-477964c22e0so23717865e9.0 for ; Tue, 18 Nov 2025 02:29:54 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477a96a58c5sm15553695e9.0.2025.11.18.02.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 02:29:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763461796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=do+UbaBiOOwddVkAoLI/+bC2dQuwohtwYVd2EuLCMA4=; b=Z0nSG5lE9NhtcWZ49wmqOnh2aMv7ohfgjAzxp1pJizbsqFv51FcQ+aetkjgVxcV9N9R1Cl oV6UHomshfKhSfIxgZnFZOdcNm6KkL1i1AokwgtngMNLh32VyXchJMXij9/CZiUsO44c44 QbTIIXhh3Y5Pg8nZycRef1u3/0KPZCo= X-MC-Unique: h73dvMsEOPexueXTj6VddA-1 X-Mimecast-MFC-AGG-ID: h73dvMsEOPexueXTj6VddA_1763461793 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763461792; x=1764066592; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=do+UbaBiOOwddVkAoLI/+bC2dQuwohtwYVd2EuLCMA4=; b=LI0C8v3cvh+rOJ9foQezRcaEdCyGUjtAj0Hk4xDrKgKtw0OuiBaA2YHuNU/3R63/s/ vqnEZ8is5MQ4oaKYd9JWz/EL6hXjj3I+WIvHTp4uecL+2OSg4VK/VYCQV5wAGTFM71lQ SVDzUpRSR2ilJwafanNdhCbRsuqTjpeH+6nApEzRCj/A9GtwVoiFd7ijpIL5PxwLi422 6yDGAEBkfbUenVOKt6nh4CjH51Z6rLpeRY/JMA5yY6eDssVmKhpJfbr23dcYHIgcnLQ0 0FsLWOuvEVTWyUdmMpjtRJfsOreoMoEwbqUO/KO2B5ScgTVlOajJ/zIQnGkhtJpWnfH5 RXkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763461792; x=1764066592; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=do+UbaBiOOwddVkAoLI/+bC2dQuwohtwYVd2EuLCMA4=; b=ioP4Vyx0meozGwVGyKdL62XOfDJnE0iohwD5JtgdfXHtodgJoic4uPra1Ma4S1eCXm 7QkIM8FIkxiCEsCGQb3Q26Fk9+D98i8vnU5LiJxiCECoDo6422DjYrPPhNKtydhlgTNu rzWm9xCXEBLM4Y9hOIbiKJdFMjlr3Qja2k8nvdtBJqgV7IPsungHphzuxiqIQBpxclFE wJRGDCRMSmnrnT5hEwaLFxmrLQy6plBveTSze3Jt9lGIgQtdszN3Jv3EiUO15My6ZrHb e61NJ4FJ8fYE6X7aCIcj820IfEh9IOitE87qMIg4tdS2L8kTLQTI4lcTQZHctR7kCnA0 38lg== X-Gm-Message-State: AOJu0YzvFB6Kwcchk1bNd0VGcGVgp3e6fSI4PKidopi/rswuaFKtZ5qR cfLgNLFusIjc487phzKr8RdqRVejdrg/LY9V4Fvfl12khZ65sh/xdQHTzRS2JfTppgb9ERArsw5 1h39wNjRmKf8qLTRg1rMA2HBYFQgDW0tKzeUX2t0q0lRdham/4f8o5semmjIYXWaxMwqaY+Y+z8 BG0Tg9eeipg4naoDQeFG73nsPRaL/hBA2EUjoCJJMl X-Gm-Gg: ASbGncs0rxD9D0VH5txSSLBR2vNH3ArYqUQfTgFeKw+CtKRzELAaJFgFg9taqrVRZkX m7qOYdaQJOHLa5kgUcEGjyqx3nDuWFCc9ZBD4ONF/9/fIVkqHDaaimeJax18rh0PESRQsvtl2WG JaKV+KYttfLq7Ke96jW8ubroe9YUxdPC0oYi7mee9d6pOdkmGMvpZY9GIH/ULB3OiAHDME0TUVO gSsyOEXC9nmhe16Ox2OFOJzsMELg8W02l6mKd7WrmbCjxfTjvljyuX2F3Qhnvyl/nqYxz59FrFg 99jhbComDFLf5oRdcSHlw/gh88dLhHAJiyhK02egthhGkmnR3xs2Gpo27sxivEQqReBHmv/EnSp VZ9h7TAnHLb9l/eEsKr6SRp+iIvUKgP4SYvYXt4vYqHZsLaOcWabMDGHYktdHQveT9+st+88KbW muEdXIF1/MdxveCZA= X-Received: by 2002:a05:600c:a0b:b0:477:bf1:8c82 with SMTP id 5b1f17b1804b1-477a94fd02amr24196655e9.15.1763461792274; Tue, 18 Nov 2025 02:29:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IEy6/5UJNYCpNSIxBQZA7Mx7WNuk7k6GYNY3910D0VMtBf+TDiyacXTpCeZGx+swsAuTizSyQ== X-Received: by 2002:a05:600c:a0b:b0:477:bf1:8c82 with SMTP id 5b1f17b1804b1-477a94fd02amr24196345e9.15.1763461791842; Tue, 18 Nov 2025 02:29:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, alex.bennee@linaro.org Subject: [PATCH v2 3/3] mtest2make: do not repeat the same speed over and over Date: Tue, 18 Nov 2025 11:29:42 +0100 Message-ID: <20251118102942.551194-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118102942.551194-1-pbonzini@redhat.com> References: <20251118102942.551194-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1763461838860153000 Content-Type: text/plain; charset="utf-8" There are just two of them (slow and thorough; quick is simply the default). Avoid repeating them for as many times as there are tests. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e --- scripts/mtest2make.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 692e4867ec7..19c11ed9352 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -14,7 +14,7 @@ class Suite(object): def __init__(self): self.deps =3D set() - self.speeds =3D [] + self.speeds =3D set() =20 def names(self, base): return [f'{base}-{speed}' for speed in self.speeds] @@ -62,10 +62,10 @@ def process_tests(test, targets, suites): suites[s].deps.update(deps) if s.endswith('-slow'): s =3D s[:-5] - suites[s].speeds.append('slow') + suites[s].speeds.add('slow') if s.endswith('-thorough'): s =3D s[:-9] - suites[s].speeds.append('thorough') + suites[s].speeds.add('thorough') =20 def emit_prolog(suites, prefix): all_targets =3D ' '.join((f'{prefix}-{k}' for k in suites.keys())) --=20 2.51.1