On 17/11/2025 19.51, John Snow wrote:
> This group is intended for packages required to run "make check"
> successfully. Once qemu.qmp is fully divorced from the source tree, this
> will primarily mean the qemu.qmp package and the remaining in-tree
> python packages. It specifically excludes packages only needed to run
> the functional tests, which are not invoked by default for "make check".
>
> Amend the "check-venv" target to install both dependency groups, to
> avoid a duplicate dependency between them.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
> pythondeps.toml | 4 +++-
> tests/Makefile.include | 2 +-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/pythondeps.toml b/pythondeps.toml
> index d814bb54d08..b931d8bb578 100644
> --- a/pythondeps.toml
> +++ b/pythondeps.toml
> @@ -31,6 +31,8 @@ meson = { accepted = ">=1.9.0", installed = "1.9.0", canary = "meson" }
> sphinx = { accepted = ">=3.4.3", installed = "6.2.1", canary = "sphinx-build" }
> sphinx_rtd_theme = { accepted = ">=0.5", installed = "1.2.2" }
>
> -[functests]
> +[checktests]
> "qemu.qmp" = { accepted = ">=0.0.5", installed = "0.0.5" }
> +
> +[functests]
> pygdbmi = { accepted = ">=0.11.0.0", installed = "0.11.0.0" }
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 6f86eb283d3..40b114bd158 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -98,7 +98,7 @@ quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \
>
> $(TESTS_VENV_TOKEN): $(SRC_PATH)/pythondeps.toml
> $(call quiet-venv-pip,install -e "$(SRC_PATH)/python/")
> - $(MKVENV_ENSUREGROUP) $< functests
> + $(MKVENV_ENSUREGROUP) $< checktests functests
> $(call quiet-command, touch $@)
>
> check-venv: $(TESTS_VENV_TOKEN)
Reviewed-by: Thomas Huth <thuth@redhat.com>