From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Cleber Rosa" <crosa@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Li-Wen Hsu" <lwhsu@freebsd.org>, "Kevin Wolf" <kwolf@redhat.com>,
qemu-block@nongnu.org, "Michael Roth" <michael.roth@amd.com>,
"John Snow" <jsnow@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Ed Maste" <emaste@freebsd.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v3 05/15] meson, mkvenv: add checktests and functests custom targets
Date: Fri, 5 Dec 2025 01:00:47 -0500 [thread overview]
Message-ID: <20251205060058.1503170-6-jsnow@redhat.com> (raw)
In-Reply-To: <20251205060058.1503170-1-jsnow@redhat.com>
add "pyvenv_checktests_group" and "pyvenv_functests_group" targets to
meson. These targets will invoke mkvenv.py to install the associated
dependency group to the build/pyvenv directory.
Signed-off-by: John Snow <jsnow@redhat.com>
---
meson.build | 1 +
pyvenv/meson.build | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 pyvenv/meson.build
diff --git a/meson.build b/meson.build
index d9293294d8e..d7f06b8392b 100644
--- a/meson.build
+++ b/meson.build
@@ -4587,6 +4587,7 @@ subdir('scripts')
subdir('tools')
subdir('pc-bios')
subdir('docs')
+subdir('pyvenv')
# Tests are disabled on emscripten because they rely on host features that aren't
# supported by emscripten (e.g. fork and unix socket).
if host_os != 'emscripten'
diff --git a/pyvenv/meson.build b/pyvenv/meson.build
new file mode 100644
index 00000000000..6e8acd9f2b8
--- /dev/null
+++ b/pyvenv/meson.build
@@ -0,0 +1,40 @@
+# Note that this file only controls "optional" dependency groups; groups
+# *required* for the build are handled directly in configure instead:
+# namely, meson and sphinx.
+
+# NB: This command may or may not include the "--online" flag, depending
+# on the results of configure.
+ensuregroup_cmd = config_host['MKVENV_ENSUREGROUP'].split()
+
+pyvenv_common_deps = files(
+ meson.project_source_root() + '/pythondeps.toml',
+ meson.project_source_root() + '/python/scripts/mkvenv.py'
+)
+pyvenv_wheel_dir = meson.project_source_root() + '/python/wheels'
+
+
+# This group *must* be available offline, for "make check"
+pyvenv_checktests_group = custom_target(
+ 'pyvenv_checktests_group',
+ output: 'checktests.group',
+ input: pyvenv_common_deps,
+ command: ensuregroup_cmd + [
+ '--dir', pyvenv_wheel_dir,
+ '@INPUT0@',
+ 'checktests',
+ ],
+)
+
+# This group is allowed to rely on internet, to fetch from PyPI.
+pyvenv_functests_group = custom_target(
+ 'pyvenv_functests_group',
+ output: 'functests.group',
+ input: pyvenv_common_deps,
+ depends: pyvenv_checktests_group,
+ command: ensuregroup_cmd + [
+ '--online',
+ '--dir', pyvenv_wheel_dir,
+ '@INPUT0@',
+ 'functests',
+ ],
+)
--
2.51.1
next prev parent reply other threads:[~2025-12-05 6:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-05 6:00 [PATCH v3 00/15] python: drop qemu.qmp from qemu.git tree John Snow
2025-12-05 6:00 ` [PATCH v3 01/15] python/mkvenv: create timestamp file for each group "ensured" John Snow
2025-12-05 8:32 ` Thomas Huth
2025-12-05 6:00 ` [PATCH v3 02/15] python/mkvenv: bump 'qemu.qmp' dependency for testdeps John Snow
2025-12-05 6:00 ` [PATCH v3 03/15] python/mkvenv: add 'checktests' and 'functests' dependency groups John Snow
2025-12-05 8:47 ` Thomas Huth
2025-12-05 6:00 ` [PATCH v3 04/15] python/mkvenv: add mechanism to install local package(s) John Snow
2025-12-05 6:00 ` John Snow [this message]
2025-12-05 6:00 ` [PATCH v3 06/15] tests: Use configured python to run GitLab iotests John Snow
2025-12-05 6:00 ` [PATCH v3 07/15] tests: run "make check-venv" before running iotests John Snow
2025-12-05 6:00 ` [PATCH v3 08/15] tests: ensure "make check-venv" is run for crash tests John Snow
2025-12-05 8:53 ` Thomas Huth
2025-12-05 6:00 ` [PATCH v3 09/15] tests/lcitool: add python3 wheel and setuptools deps for qemu John Snow
2025-12-05 6:00 ` [PATCH v3 10/15] python: add vendored qemu.qmp package John Snow
2025-12-05 6:00 ` [PATCH v3 11/15] meson, mkvenv: make iotests depend on checktests group John Snow
2025-12-05 6:00 ` [PATCH v3 12/15] meson, mkvenv: make functional tests depend on functests group John Snow
2025-12-05 6:00 ` [PATCH v3 13/15] meson, mkvenv: add qemu.git/python/qemu package to pythondeps.toml John Snow
2025-12-05 6:00 ` [PATCH v3 14/15] tests: replace old "check-venv" target with meson target John Snow
2025-12-05 6:00 ` [PATCH v3 15/15] python: delete qemu.qmp John Snow
2025-12-09 16:35 ` [PATCH v3 00/15] python: drop qemu.qmp from qemu.git tree John Snow
2025-12-09 17:00 ` Daniel P. Berrangé
2025-12-09 17:23 ` John Snow
2025-12-09 19:43 ` John Snow
2025-12-09 19:46 ` Daniel P. Berrangé
2025-12-09 20:05 ` John Snow
2025-12-10 16:25 ` 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=20251205060058.1503170-6-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=emaste@freebsd.org \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=lwhsu@freebsd.org \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).