Commit bb1f3a9594 for qemu.org
commit bb1f3a95943516bd1696b5a2a908f549d24044d6
Author: John Snow <jsnow@redhat.com>
Date: Wed Feb 18 16:34:10 2026 -0500
configure: unconditionally install "tooling" group
Alongside meson, always ensure our in-tree tooling group and its
out-of-tree dependency, qemu.qmp, is always installed.
As a result, several "check-venv" invocations can be removed from
various testing scripts.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20260218213416.674483-16-jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index b2db70ff90..1b656b9eb0 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -101,7 +101,6 @@ crash-test-debian:
IMAGE: debian
script:
- cd build
- - make NINJA=":" check-venv
- ./run scripts/device-crash-test -q --tcg-only ./qemu-system-i386
build-system-fedora:
@@ -158,7 +157,6 @@ crash-test-fedora:
IMAGE: fedora
script:
- cd build
- - make NINJA=":" check-venv
- ./run scripts/device-crash-test -q ./qemu-system-ppc
- ./run scripts/device-crash-test -q ./qemu-system-riscv32
diff --git a/configure b/configure
index 4b61fd3bbf..c4837eba2b 100755
--- a/configure
+++ b/configure
@@ -966,7 +966,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
# Finish preparing the virtual environment using vendored .whl files
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
- ${source_path}/pythondeps.toml meson || exit 1
+ ${source_path}/pythondeps.toml meson tooling || exit 1
# At this point, we expect Meson to be installed and available.
# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index 8a91dcaee3..fc86babdf4 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -40,8 +40,7 @@ try:
except ModuleNotFoundError as exc:
path = Path(__file__).resolve()
print(f"Module '{exc.name}' not found.")
- print(" Try 'make check-venv' from your build directory,")
- print(" and then one way to run this script is like so:")
+ print(" Try running this script like so:")
print(f' > $builddir/run "{path}"')
sys.exit(1)