Browse Source

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>
master
John Snow 6 months ago
parent
commit
bb1f3a9594
  1. 2
      .gitlab-ci.d/buildtest.yml
  2. 2
      configure
  3. 3
      scripts/device-crash-test

2
.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

2
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.

3
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)

Loading…
Cancel
Save