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>
John Snow committed
Feb 18, 2026 at 16:34 UTC
bb1f3a95943516bd1696b5a2a908f549d24044d6
3 files changed
+2
-5
.gitlab-ci.d/buildtest.yml
-2
@@ -101,7 +101,6 @@ crash-test-debian:
101
IMAGE: debian
102
script:
103
- cd build
104
- - make NINJA=":" check-venv
104
- ./run scripts/device-crash-test -q --tcg-only ./qemu-system-i386
105
106
build-system-fedora:
@@ -158,7 +157,6 @@ crash-test-fedora:
157
IMAGE: fedora
158
script:
159
- cd build
161
- - make NINJA=":" check-venv
160
- ./run scripts/device-crash-test -q ./qemu-system-ppc
161
- ./run scripts/device-crash-test -q ./qemu-system-riscv32
162
configure
+1
-1
@@ -966,7 +966,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
966
# Finish preparing the virtual environment using vendored .whl files
967
968
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
969
- ${source_path}/pythondeps.toml meson || exit 1
969
+ ${source_path}/pythondeps.toml meson tooling || exit 1
970
971
# At this point, we expect Meson to be installed and available.
972
# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
scripts/device-crash-test
+1
-2
@@ -40,8 +40,7 @@ try:
40
except ModuleNotFoundError as exc:
41
path = Path(__file__).resolve()
42
print(f"Module '{exc.name}' not found.")
43
- print(" Try 'make check-venv' from your build directory,")
44
- print(" and then one way to run this script is like so:")
43
+ print(" Try running this script like so:")
44
print(f' > $builddir/run "{path}"')
45
sys.exit(1)
46