From nobody Thu Nov 20 12:30:01 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=1763397117; cv=none; d=zohomail.com; s=zohoarc; b=muN+qraJ+cZI0ER4MvvDoucW+SYYqrWBhRsaowMTzHIE3DC+IbKzeS+f+gVxGWTcqESCo1nKVVmi7Q8luwNBoUZi9PrIe7dAxZWhZEhNU94ysiPevAYjH1M4hc4lKbZWK+4CuM0VHxx4zWQWQrQ5taPu60BPBClPxNNWwWQzLYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763397117; 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=2pn8tdgNfLASOvuPWNTWM6oSQ6NEVCBo2XL5ksJU9So=; b=COT1WCX7PZ8crlMq9ID8XXjcPbiOOKN9x9UKyOD27r5ioyMNLDBGPP1/buvUyjmTrMfywsB8fPvCHX4OlDvTGDXdbZaG4kvDqUmWhijn90d9DjCIoBkbO5WQG6Pwt9pq09a6VY8rMO+nEmKqPnJTHQA4st0xOzQI36c6bYMdcSg= 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 1763397117966423.76353772317816; Mon, 17 Nov 2025 08:31:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL28R-0007G7-8u; Mon, 17 Nov 2025 11:31:23 -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 1vL28M-00079k-OF for qemu-devel@nongnu.org; Mon, 17 Nov 2025 11:31:22 -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 1vL28K-0007gh-Sj for qemu-devel@nongnu.org; Mon, 17 Nov 2025 11:31:18 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-597-5Ysr__7aMjOVxPWn-URCbQ-1; Mon, 17 Nov 2025 11:31:13 -0500 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-429c76c8a1bso2735847f8f.0 for ; Mon, 17 Nov 2025 08:31:13 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53dea1c9sm27261602f8f.0.2025.11.17.08.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 08:31:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763397075; 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=2pn8tdgNfLASOvuPWNTWM6oSQ6NEVCBo2XL5ksJU9So=; b=M721b6ABKy4vxZ0hK7tAvpwrJ5Ggi8UKvE6IG8gb/y/PsdUnQ3uCK2Nsg6/olZghPkVxQo OtqRuG26jkjd09MNNikXPx1VIvEzcZRreeuTZx82zY+M6ah2qk6cp/R2wghBT4aJlF7GF+ Fys3fq9N5mlneI3WkBlZyrpEdhCivyc= X-MC-Unique: 5Ysr__7aMjOVxPWn-URCbQ-1 X-Mimecast-MFC-AGG-ID: 5Ysr__7aMjOVxPWn-URCbQ_1763397072 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763397071; x=1764001871; 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=2pn8tdgNfLASOvuPWNTWM6oSQ6NEVCBo2XL5ksJU9So=; b=TtmLfojDkI+HAsmdlvmEHR0MdrS5DpFOBkuWq3TIdLwzIS1GcWyW6mjUGVmTMYRDqp mB1vmmJs/M1PeykqGzPEEvlX/WU/ESiVmj5Sj8uemZZ8Cm2UC+TjlNGNKwwGL9NdkZPa Go1xxhSLcH1klKBiByLtnEeRTsP5vxTzG5sHmdt2DAjzNH3hBvBbnPF5X9S8qjr2zD6u OQYnWtqqwfEmtmbesX9DR6A2LM5PehPucg3yPIsUYBCyzT++7NJUC2JJ9UcwHXoKzPXR ds1g477mBQKIBdU5olVLzritpNmBhCT8K979zXVop6zD2MXbbzNLatzS6o+bTZQuHL7m iNhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763397071; x=1764001871; 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=2pn8tdgNfLASOvuPWNTWM6oSQ6NEVCBo2XL5ksJU9So=; b=hYAvi1CbO+CLpOp9D+Dl9xyUy7DAsfXdcbgDdLSHwkn59PdPWJ4ZXjo5Equ6QbvtN9 faYNTWzAddh1L0iaezZexZwfaBzd8X66kgivYZdWUQx0nM2bDcpX36G9gwqwBNhQQhSz j8gOjCwhKzC6hJ7bic3dOr9yAQ5zReK4Bo+VOV2Nqt08VnrPw53Ni0TQj35jIU4wu7Ch 3cEBkSfYM3QeefR2CaKC9cFQVwtaaGkIKNDOTzSYPfpiRM8cMk8wk/8UwJbWuu2dZBEv +jvj+Kig3VEpWGhggXQnkO5JETdLqA4olZgVcbyK+pXjGDUUENcgkxgrGhqeH1uflFKr Ie0A== X-Gm-Message-State: AOJu0Yx/zYS5y53KSeAziIQrZ0HV6tb07CwF58xe+wYccbMFNdArJiIZ X2q556cPpgFsKKw6hCAtCLmqUOMD6e4U44mdD+QQDE2w5CPcOhnw5ctdd7p1mcJtgO7KIlHxa+r kvWOYtjAvdsH+J9FkXT9QJ/v35OV/ZRpyHlYrir0p+oNBqDHHbrc8lv5wCwRzlk924uNfdwM/xS GQSHT+ISBc/qlm78orKK/7peyuMNcGxHc1vDBtW1Ex X-Gm-Gg: ASbGnct5zSyeITz5x4SWEMauMYpaRPTx9BH4vj4HAqTogZBpK+4aQlYrZmvT82RZtVm aElPX0stfSU+w2vkfCfqHP3WPQeJJw1LOYqp2UBBMVW4O2tBDGPwDeQbM7KNR3CoPBc0VSsluHQ vd72kjKlKY2GyIujvIbplXThW2j7lCYp1bZAw5uhs260B6GoP8gqVmPqdtIlBt4/ZoMxoZCMynx NN3wkWVlT2Xp9WRXwklhWVtegxWi4psHT9jAMI6fnSH1sBCm7sv+ci+WiIIB3xS9zaGn91yoYdz G1nktpQZCe7h20oTGTA2Vj/Kcx/MjEkxMnLfU5Axnq3hdxEIRAl5Kdai8/j2emcPLVH52SrV/s1 e69MQGU27FIuR38HdxpwvV49F3Huj6M5fnTjEOQielUEXI4scz5v9zbasvE7Vmr90bLdFrOE0zj Tx/hcB X-Received: by 2002:a05:6000:1ace:b0:3ff:17ac:a34b with SMTP id ffacd0b85a97d-42b59383b2dmr12854976f8f.42.1763397071195; Mon, 17 Nov 2025 08:31:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IFLWAqTbjxJLdcShd9EuFkYF7JjwGuWiMRtkrUGAvFY8pM0W623wuE3rMwfbFZ7lqOhyC7x4A== X-Received: by 2002:a05:6000:1ace:b0:3ff:17ac:a34b with SMTP id ffacd0b85a97d-42b59383b2dmr12854948f8f.42.1763397070747; Mon, 17 Nov 2025 08:31:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: jsnow@redhat.com Subject: [PATCH 1/3] mtest2make: cleanup mtest-suites variables Date: Mon, 17 Nov 2025 17:31:05 +0100 Message-ID: <20251117163107.372393-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251117163107.372393-1-pbonzini@redhat.com> References: <20251117163107.372393-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: 1763397120434158500 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 look at the set of suites to set ninja-cmd-goals, instead of doing it via many different .ninja-goals.* variables. As a bonus, this removes code duplication between emit_suite_deps and its caller emit_suite. Since emit_suite_deps would now be one or two lines of code, integrate it into emit_suite directly. Signed-off-by: Paolo Bonzini --- Makefile | 4 +++- scripts/mtest2make.py | 35 ++++++++++++++--------------------- 2 files changed, 17 insertions(+), 22 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..af4ee56de54 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -20,12 +20,12 @@ def names(self, base): return [base if speed =3D=3D 'quick' else f'{base}-{speed}' for sp= eed 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,20 @@ 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))) + print(f".{prefix}.mtest-suites +=3D $(call .speed.$(SPEED), {names})") 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:30:01 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=1763397117; cv=none; d=zohomail.com; s=zohoarc; b=DMRIevI1yBqPo4ld9T1ugdHDXa2AEpoifUMFNPhDAsbQXB6x6Y4yF0zt0XELF29caC6fWYzoruDUe6+JQ8YT9nFLvQY1zIl9RHGWdCnZuyxo43SIttPvg21G/ffpLICH8OB493jDgqJHY0k2tx0D8JZ2CgGpAnlIt6GW1WaR+yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763397117; 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=soTguZMNWGUli6h9FPm5MZ7HtS24tlGq4wCa+drJnqo=; b=LbhBtHrjcjmtkM4cJMTm1RHGk/YJh0LF5FeoEswDIsxzPi1Rtwtc2ZM1oX/h/7Q2qsImJfTqwy+DwfUWycgJzZLNHuXnaV7d5yFlQ3A1oy7MV/hDsUK4uZS4msaWMRk0D7EuoHm5RpiNaKKGpcGDOrrHdxM5bhAS2tI+XZr8nno= 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 176339711774752.45663338882309; Mon, 17 Nov 2025 08:31:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL28R-0007Fl-57; Mon, 17 Nov 2025 11:31:23 -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 1vL28O-0007AD-O1 for qemu-devel@nongnu.org; Mon, 17 Nov 2025 11:31:22 -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 1vL28M-0007gt-V3 for qemu-devel@nongnu.org; Mon, 17 Nov 2025 11:31:20 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-ulBDOdhLOCegQOkU4zAgOw-1; Mon, 17 Nov 2025 11:31:16 -0500 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-477a0ddd1d4so11549605e9.0 for ; Mon, 17 Nov 2025 08:31:15 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477a7cb24dfsm26479915e9.14.2025.11.17.08.31.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 08:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763397077; 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=soTguZMNWGUli6h9FPm5MZ7HtS24tlGq4wCa+drJnqo=; b=NCUdMvnjauAFOQEpV2y/gDiQRop5jKmXePp4nR2KeVtvZTqMJZa3YNVKoYoevNdzVK2iyk QyaYGQ6iSYCDpfRp95NO0VrST8Gd7VGRkHs/ISX2xg+JY1FPwu6LqJEqDQccmyKppRcFnp rL3aadXHSFgGYeL0krGHm2DCBLllO6M= X-MC-Unique: ulBDOdhLOCegQOkU4zAgOw-1 X-Mimecast-MFC-AGG-ID: ulBDOdhLOCegQOkU4zAgOw_1763397075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763397073; x=1764001873; 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=soTguZMNWGUli6h9FPm5MZ7HtS24tlGq4wCa+drJnqo=; b=RfH12d5MAFU2gecFmPCGX+Ff7/5XCjw4bPNZej1T04N9t+iFgnzDxsZ6bM4KRHBKmD sNyrn/8/zh5+zQSdjlRO4o2FStVrjyPDNbvMS4m3Pb6i7cU1HwePwut6dEMhXFoMuOqz f0eUCe1OhrXw84LQxZIE8/sXCIWjwfAtFeWMZjkuNdyqNWWoIAHi6MDVkhW3ekfyjaHx xft0eQedBiiEhOpw0X5Wj9uEfgyLGzJ/xEQRA2JxzOy51v0/p6olHpxBtew0kOjlXwmH FdP54VrjpB+/PCCjGtimZOv66kDDOIYAMwxaTow7rnIcAj9pHSv3LoSWAFTbzzMaPQvP h7gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763397073; x=1764001873; 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=soTguZMNWGUli6h9FPm5MZ7HtS24tlGq4wCa+drJnqo=; b=mc/uxXa7BiH5s7F1v+AU0eIwtwLPXqPqHjv1m0B2n/rLC1TisLpheqVgkQl5fhzDNx lAL73qohuRllBXaTZZIJa7rDz1Pz1hAt/C1TfSFGVwFqxoZN7hliNn0cjuEUSCQgkB5+ A0b5ktXuvsxUYPjWn+QMexL4KSI/DOaS4+RqPEX/ZiC9ASnYVwAV57vdZGihwCwS1qWl 0U22HaTMgMDYOMWnH2tWwCXMihHgwkgIaoH7GzoP4tUw/a2h9IY1VDRgyK7n9AAbCoEW 8U1Ou0B8/EB0H4l9EmTfCw+D1Cvzvq3P1nG1ATs939kidaKSPF18OSWqMsnoZ276JSxo 9qgQ== X-Gm-Message-State: AOJu0Yy0aE9qyNe9joj8kgJNkQA48zZfGZfPjCfh9I1uMKhGvn2sCORX seV4R7aYVECU4dk4OH1yV6sREl1gyLnqM7J1mSiK/9E8+Cx+PSUxTpo39c6iA/0vp4mgW/itANr q9jBmZ9+BpZa6ggathhtt//07tCvMYQk8MW0tXP3dg0lsDl6Ev3aULJ82lFGxr681+bbh30qN4I tSWo6dORJZPrP360wY0vnFrY9sYirQs/S4gzU6AiZG X-Gm-Gg: ASbGncuZjQGk9PPvMt21B0wBbt0nOdiZZKL5D41qbuKNTBzE0LxOrKkI4836r+slT9N hHT+axf5H4UA/6S86H9zyIHX+RSjT9lwIQoSc3QLUFIX1pkoUhNRL6ZlkQtE3IQXA29mUS4s/fg hMUk9mZqBkTFNu6ThbJk3cximzjDTJLlmaLG10V+endzI1E9C1D7Af+WNxeVqiQZcvp75ts9INK +q+x+m/vqw2w1sEak62zQH+qfPGLqVGMT8y+wBMFx0QsPDwyZLWQ5igAYVyoesWMKml9EYgcTAB 3aRntGUja7Q/83xT7uKTc3oya2V+HFPKGeMd+/N+Zh0VK4ELoXVK/+v4yXPSg3P7uF4c4BvYTUc 1gRn1RcS8tI0cK3jA0xp4CaCdn5ngEPSX4J3VXTpEIquc6a8b0lghbuveHZ//5MQXwe+1fgyaMZ 7rt53c X-Received: by 2002:a05:600c:6c8b:b0:477:95a0:fe95 with SMTP id 5b1f17b1804b1-47795a0ffbcmr67953415e9.24.1763397073504; Mon, 17 Nov 2025 08:31:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHAIf0osXXNHyuXMUHSDbm5xuBhlU5qcRFCegI2YpCTNTukCQmhy4vVjRFMmtKcidJC+ZSpyw== X-Received: by 2002:a05:600c:6c8b:b0:477:95a0:fe95 with SMTP id 5b1f17b1804b1-47795a0ffbcmr67953145e9.24.1763397073044; Mon, 17 Nov 2025 08:31:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: jsnow@redhat.com Subject: [PATCH 2/3] mtest2make: add dependencies to the "speed-qualified" suite Date: Mon, 17 Nov 2025 17:31:06 +0100 Message-ID: <20251117163107.372393-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251117163107.372393-1-pbonzini@redhat.com> References: <20251117163107.372393-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: 1763397121057158500 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 --- scripts/mtest2make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index af4ee56de54..d32eef2f7f4 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:30:01 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=1763397124; cv=none; d=zohomail.com; s=zohoarc; b=J4S7fkw/Q+af3IhmiSx6Ene+OHLjZPZhWPLHBBVtO75p5U9J70uduL883cC5k2qx0akUavP/vtBcqn9HUF/0ezoyH02cF6QW2ajkPXXzjIejK27pBJWm5r+6Vh9DTxMq83iUC1Nv8/DXnrXGeC+V6UGaYpIAOhA1H13iYDns1I0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763397124; 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=q10xK85V9eTQ7DlgmxFXQKaQw89HU4P1/5M6DW8MO80=; b=mcuMxric/4EGwDc92TX3VKXEphkzcXzWUORKfR8uuvKA44Ao7ylDhTQPCOioykFkjUJEk5kkLAlbu6HFz64gZlHRAVPB+/d1RXYlGQvctIwDvQCdpapPfxczUTSuP2lp9VvcE28Bboq/R0eLzel+q/dKxUaZUbl0wfWNpKcLlXs= 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 1763397124890227.585456102668; Mon, 17 Nov 2025 08:32:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL28U-0007Ir-Gi; Mon, 17 Nov 2025 11:31:26 -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 1vL28Q-0007Er-Qu for qemu-devel@nongnu.org; Mon, 17 Nov 2025 11:31:22 -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 1vL28P-0007h6-8M for qemu-devel@nongnu.org; Mon, 17 Nov 2025 11:31:22 -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-658-swEOyHvwNvqe04gxMqzmTw-1; Mon, 17 Nov 2025 11:31:18 -0500 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-477a11d9e67so10849975e9.2 for ; Mon, 17 Nov 2025 08:31:18 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47787e36ca3sm340067495e9.5.2025.11.17.08.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 08:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763397080; 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=q10xK85V9eTQ7DlgmxFXQKaQw89HU4P1/5M6DW8MO80=; b=djBwve7CUChijtL6E3E5Y3jqxG87rF6/tm/t8HSJzA/v8x5xd5P+YJCyPvIbNlLXBemrmT GAVLz3F82IIsKRtWMZe/9Ii5IqFzg40smFr4TCZoCMhuZG5snhH8pTmZijjL57d73RYK/N YrM8mMNlETgBLhDub+fIzcFmFHt/o9E= X-MC-Unique: swEOyHvwNvqe04gxMqzmTw-1 X-Mimecast-MFC-AGG-ID: swEOyHvwNvqe04gxMqzmTw_1763397077 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763397076; x=1764001876; 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=q10xK85V9eTQ7DlgmxFXQKaQw89HU4P1/5M6DW8MO80=; b=geUcogDZHUKWkacJmYl/A68zbvgMHtaSEp4NUIAbnZtTsnWv4Xxfgd/vO5DuXJgZn7 iGdoqaARTtqHrOXSDmd6Y3vdrUYTWaZreVxNZmsDSE77tPgktHUZvwIo/KlFAE4F7Ivv tM+L9uSVHWrzPp4mrSUFMViYzlMOCjUjKtW3Uz07VjegSgM8jYJYnWA9VKIWREuTqVA+ xWsREDJ9hR4fO5TQuPNOHisCso642exPtSP/bivle6sgh4QL/TzBwXHkEbCBzhe21Zru 70czJhr3nSiOHIt4SWo7T4nHVYDAhYbZOzmr4T4DWULh+DAeEA/Etaay039nQo73XX2c j0xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763397076; x=1764001876; 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=q10xK85V9eTQ7DlgmxFXQKaQw89HU4P1/5M6DW8MO80=; b=qFcdR4JrIFuXUaiU91ZmNePvIqUF8+Fe3kOOHBLQdferamh6ewEiJ/z/Eav7wxK3qh gX+BFzHiHMDpdVhD1BHgeECG4ljrb4q99CT+ghKPoxD9EOzedOeY+8L0c/sCfpysGS5j C9Spq/nmN3pv3C28I6dqKwdbQ0ynm1XNdasTvT4v7k5+nfT6Un2Ix/CnRfoMQtxPCKyk u3vM4Inld7msBdX5dJyucw0332plBDIZMaUTjNikgmaqnolAJ0jg2dbxcU4ckGQogtLm xE2Ba3et1OTaz/wbhcwkLG0C33pjBu/MuQSXKGLAcqQ13hTIkmPbI1McGGRKAST5JbeD IBNg== X-Gm-Message-State: AOJu0YynLmn4q0ITWaV7yKMlmSGTH7mLFZnh4A4YifjS1zzBHy3Uz8kg IIx810Di7luhINqIiRCdHX3XJT7D0EaFxoYG3KpySUsk6pO7xzim9oBk+Ss+0yO7v4sAo6rnJYw btnMAok5emR+znZUORvd7c8lA+SAC3HwQqZu3tHAiMMwspScFv6d8l07tkuZ+/0Pxhxls6dQB+x TAQxO6n/6h2vTSQqT6QzI1voQvFOupXq87uHbOhVrQ X-Gm-Gg: ASbGncs0KN31C0/IoxW5NAXEb08xfEy3XmnnZjXzHXhVdJAuQzIitbbSZS1dnK5c7EN uz6XrJ7A7cMHmflR914r/dNT57mx24dNhuLim4rxvcpXexJln1reyC6miy73ThDXeoG4ZUycvaF HENbyBGu93MvwTdK6W4aKq7rrLEqnsgGZrdXcKX0GF+ML54PeX7MFUYydOjjjxRII0qmkdNEmkF WmcyRIeDmhQnaExrMwEtJqHRkizmPvoH04ufpdaWsbWub07jlF7gmxx0bsDL2afWUsda349/aFB kKpkJyLjZY1HPf5oOCmRi4mA94lrziWCd5fyklkdPwx7zW73nWGRrIjhzvDVoFDbGAeFhelx0kC TaI9eZ8ikH8eoA3HeVph/CNGyxJILQHgW4XUnWQYzfWk1Vc4kSdPiDOFq6Z00R3rpTBRQY4mUvV YzvhWV X-Received: by 2002:a05:600c:4995:b0:477:9671:3a42 with SMTP id 5b1f17b1804b1-47796713b41mr56648895e9.35.1763397076592; Mon, 17 Nov 2025 08:31:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IE3HpuKHSyu3iQuP5dckY3VWg+ETMJqmu4PV6tG2+KdtfH0gE/+Mr5Er+be0J8wWi4TxJF7lw== X-Received: by 2002:a05:600c:4995:b0:477:9671:3a42 with SMTP id 5b1f17b1804b1-47796713b41mr56648655e9.35.1763397076129; Mon, 17 Nov 2025 08:31:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: jsnow@redhat.com Subject: [PATCH 3/3] mtest2make: do not repeat the same speed over and over Date: Mon, 17 Nov 2025 17:31:07 +0100 Message-ID: <20251117163107.372393-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251117163107.372393-1-pbonzini@redhat.com> References: <20251117163107.372393-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: 1763397126188158500 Content-Type: text/plain; charset="utf-8" There are just three of them, avoid repeating them for as many times as there are tests. Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index d32eef2f7f4..2b706f94234 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 ['quick'] + self.speeds =3D {'quick'} =20 def names(self, base): return [base if speed =3D=3D 'quick' else f'{base}-{speed}' for sp= eed 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