From nobody Sun Jul 26 13:39:31 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=1777045448; cv=none; d=zohomail.com; s=zohoarc; b=hxIcTRBFsWPoudTXrP4gMxByQx03NbD2RsuS8pjpAjAqQS8gPHuDYhliYx0noyTBKgopVO1hSl/0W1TP68Je+cCNflc895GKrdTMcXfOhV5nwPu4nKivInr+Q6Ti6Kb/5syHvF07Amc03f4Inlb0YGAgVJsbOCL3nkbOBNecGio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777045448; 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=KzCo3PSmra9/lKzpcrVWthqBnqd9VaFPWe4fO6eVEt/FYilSPdZ2Of7NMu08Nd5A6DCezCsJGI10Kdva+bYaUl7N6j9qIm2qI09bsH/dDVZkr4PGSTSrCZyPvscgtXXvfFbRPPAyiNCOEsmr9OJ2xbnkfqI/J1qXw5ZFPo11qx8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17770454482537.669515260480807; Fri, 24 Apr 2026 08:44:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGIgl-0003Pr-6h; Fri, 24 Apr 2026 11:43:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wGIg3-0002rZ-8a for qemu-devel@nongnu.org; Fri, 24 Apr 2026 11:42:54 -0400 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 1wGIfx-0007PC-Oc for qemu-devel@nongnu.org; Fri, 24 Apr 2026 11:42:44 -0400 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-183-p6RsfnBJP0m1KJ0nRTjhmQ-1; Fri, 24 Apr 2026 11:42:35 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 6630618002C0; Fri, 24 Apr 2026 15:42:34 +0000 (UTC) Received: from thinkbook.redhat.com (unknown [10.44.32.213]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D1FED180047F; Fri, 24 Apr 2026 15:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777045359; 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=hlDNrft+MmjLf9HMvlc0Kqd5ekF2iupgL4XRWqABL6Qa+tyXfAceMp9k/jKql2bSCJxYvR Jbs1tDzN5uU9TPnA9yZXjwYnJpzqQLsgYXkXNbBvDktuUzsvugYI3A4MldU54ahdAQPNXY bPAXabZ4igyxkdUfVmr+AJy20Xd//nk= X-MC-Unique: p6RsfnBJP0m1KJ0nRTjhmQ-1 X-Mimecast-MFC-AGG-ID: p6RsfnBJP0m1KJ0nRTjhmQ_1777045354 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-block@nongnu.org, Cleber Rosa , Kevin Wolf , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH 06/16] scripts/mtest2make: ensure output has stable sorting Date: Fri, 24 Apr 2026 16:41:54 +0100 Message-ID: <20260424154205.364268-7-berrange@redhat.com> In-Reply-To: <20260424154205.364268-1-berrange@redhat.com> References: <20260424154205.364268-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.93 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=lists1p.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_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1777045450152154100 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