mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/vm: avoid re-building the VM images all the time

Browse Source 
The main problem is that "check-venv" is a .PHONY target will always
evaluate and trigger a full re-build of the VM images. While its
tempting to drop it from the dependencies that does introduce a
breakage on freshly configured builds.

Fortunately we do have the otherwise redundant --force flag for the
script which up until now was always on. If we make the usage of
--force conditional on dependencies other than check-venv triggering
the update we can avoid the costly rebuild and still run cleanly on a
fresh checkout.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2118
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240227144335.1196131-4-alex.bennee@linaro.org>
(cherry picked from commit 151b7dba39)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Alex Bennée 2024-02-27 14:43:09 +00:00 committed by Michael Tokarev
parent 2bd4d27aa5
commit 4934f922ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/vm/Makefile.include
View File

@ -103,7 +103,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
$(if $(LOG_CONSOLE),--log-console) \ $(if $(LOG_CONSOLE),--log-console) \
--source-path $(SRC_PATH) \ --source-path $(SRC_PATH) \
--image "$@" \ --image "$@" \
--force \ $(if $(filter-out check-venv, $?), --force) \
--build-image $@, \ --build-image $@, \
" VM-IMAGE $*") " VM-IMAGE $*")

4
tests/vm/basevm.py
View File

@ -634,9 +634,9 @@ def main(vmcls, config=None):
vm = vmcls(args, config=config) vm = vmcls(args, config=config)
if args.build_image: if args.build_image:
if os.path.exists(args.image) and not args.force: if os.path.exists(args.image) and not args.force:
sys.stderr.writelines(["Image file exists: %s\n" % args.image, sys.stderr.writelines(["Image file exists, skipping build: %s\n" % args.image,
"Use --force option to overwrite\n"]) "Use --force option to overwrite\n"])
return 1 return 0
return vm.build_image(args.image) return vm.build_image(args.image)
if args.build_qemu: if args.build_qemu:
vm.add_source_dir(args.build_qemu) vm.add_source_dir(args.build_qemu)