All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Hanna Reitz" <hreitz@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"John Snow" <jsnow@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH v2 05/13] scripts/mtest2make: ensure output has stable sorting
Date: Mon, 12 Jan 2026 20:40:18 +0000	[thread overview]
Message-ID: <20260112204026.710659-6-berrange@redhat.com> (raw)
In-Reply-To: <20260112204026.710659-1-berrange@redhat.com>

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.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 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')
 
 def emit_prolog(suites, prefix):
-    all_targets = ' '.join((f'{prefix}-{k}' for k in suites.keys()))
-    all_xml = ' '.join((f'{prefix}-report-{k}.junit.xml' for k in suites.keys()))
+    all_targets = ' '.join((f'{prefix}-{k}'
+                            for k in sorted(suites.keys())))
+    all_xml = ' '.join((f'{prefix}-report-{k}.junit.xml'
+                        for k in sorted(suites.keys())))
     print()
     print(f'all-{prefix}-targets = {all_targets}')
     print(f'all-{prefix}-xml = {all_xml}')
@@ -81,12 +83,12 @@ def emit_prolog(suites, prefix):
     print(f'\t$(MAKE) {prefix}$* MTESTARGS="$(MTESTARGS) --logbase {prefix}-report$*" && ln -f meson-logs/$@ .')
 
 def emit_suite(name, suite, prefix):
-    deps = ' '.join(suite.deps)
+    deps = ' '.join(sorted(suite.deps))
     print()
     print(f'.{prefix}-{name}.deps = {deps}')
     print(f'.ninja-goals.check-build += $(.{prefix}-{name}.deps)')
 
-    names = ' '.join(suite.names(name))
+    names = ' '.join(sorted(suite.names(name)))
     targets = f'{prefix}-{name} {prefix}-report-{name}.junit.xml'
     if not name.endswith('-slow') and not name.endswith('-thorough'):
         targets += f' {prefix} {prefix}-report.junit.xml'
-- 
2.52.0



  parent reply	other threads:[~2026-01-12 20:43 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-12 20:40 [PATCH v2 00/13] tests: do more testing of block drivers Daniel P. Berrangé
2026-01-12 20:40 ` [PATCH v2 01/13] Revert "python/aqmp: fix send_fd_scm for python 3.6.x" Daniel P. Berrangé
2026-01-13  7:17   ` Thomas Huth
2026-01-14 16:57     ` John Snow
2026-01-14 17:10       ` Daniel P. Berrangé
2026-01-12 20:40 ` [PATCH v2 02/13] tests: print reason when I/O test is skipped in TAP mode Daniel P. Berrangé
2026-01-13  7:19   ` Thomas Huth
2026-01-12 20:40 ` [PATCH v2 03/13] tests: remove redundant meson suite for iotests Daniel P. Berrangé
2026-01-13  8:05   ` Thomas Huth
2026-01-12 20:40 ` [PATCH v2 04/13] tests: ensure all qcow2 I/O tests are able to be run via make Daniel P. Berrangé
2026-01-13 11:03   ` Thomas Huth
2026-01-12 20:40 ` Daniel P. Berrangé [this message]
2026-01-13 11:04   ` [PATCH v2 05/13] scripts/mtest2make: ensure output has stable sorting Thomas Huth
2026-01-12 20:40 ` [PATCH v2 06/13] scripts/mtest2make: support optional tests grouping Daniel P. Berrangé
2026-01-12 20:40 ` [PATCH v2 07/13] tests: add a meson suite / make target per block I/O tests format Daniel P. Berrangé
2026-01-12 20:40 ` [PATCH v2 08/13] docs/devel/testing: expand documentation for 'make check-block' Daniel P. Berrangé
2026-01-13 12:48   ` Thomas Huth
2026-01-12 20:40 ` [PATCH v2 09/13] tests: add nbd and luks to the I/O test suites Daniel P. Berrangé
2026-01-13 12:52   ` Thomas Huth
2026-01-14 10:45     ` Daniel P. Berrangé
2026-01-12 20:40 ` [PATCH v2 10/13] tests: skip I/O test 128 on GitLab due to broken dmsetup Daniel P. Berrangé
2026-01-13 12:54   ` Thomas Huth
2026-01-12 20:40 ` [PATCH v2 11/13] tests: fix check for sudo access in LUKS I/O test Daniel P. Berrangé
2026-01-13 12:56   ` Thomas Huth
2026-01-12 20:40 ` [PATCH v2 12/13] tests: add QEMU_TEST_IO_SKIP for skipping I/O tests Daniel P. Berrangé
2026-01-13 12:59   ` Thomas Huth
2026-01-12 20:40 ` [PATCH v2 13/13] gitlab: add jobs for thorough block tests Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260112204026.710659-6-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=crosa@redhat.com \
    --cc=hreitz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.