[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 10/14] tests/vm: move images to $HOME/.cache/qemu
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 10/14] tests/vm: move images to $HOME/.cache/qemu-vm/images |
Date: |
Fri, 25 Jan 2019 14:00:13 +0000 |
From: Gerd Hoffmann <address@hidden>
It's easier to move around the images then, by replacing the
subdirectory with a symlink. Allows to share the images between
multiple qemu checkouts for example.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
---
tests/vm/Makefile.include | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index a98fb3027f..a58383d263 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -3,7 +3,8 @@
.PHONY: vm-build-all vm-clean-all
IMAGES := ubuntu.i386 freebsd netbsd openbsd centos
-IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES))
+IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
+IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
.PRECIOUS: $(IMAGE_FILES)
@@ -24,9 +25,10 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES))
vm-clean-all:
rm -f $(IMAGE_FILES)
-tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
- $(SRC_PATH)/tests/vm/basevm.py \
- $(SRC_PATH)/tests/vm/Makefile.include
+$(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
+ $(SRC_PATH)/tests/vm/basevm.py \
+ $(SRC_PATH)/tests/vm/Makefile.include
+ @mkdir -p $(IMAGES_DIR)
$(call quiet-command, \
$< \
$(if $(V)$(DEBUG), --debug) \
@@ -37,7 +39,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
# Build in VM $(IMAGE)
-vm-build-%: tests/vm/%.img
+vm-build-%: $(IMAGES_DIR)/%.img
$(call quiet-command, \
$(SRC_PATH)/tests/vm/$* \
$(if $(V)$(DEBUG), --debug) \
--
2.17.1
- [Qemu-devel] [PATCH v1 00/14] testing/next (binfmt_misc, vm-build and BSD CI), Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 08/14] tests: docker.py be even smarter with persistent binfmt_misc, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 02/14] travis: stop requesting libffi & gettext from homebrew, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 03/14] MAINTAINERS: Add an entry for scripts/archive-source.sh, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 01/14] .cirrus.yml: basic compile and test for FreeBSD, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 07/14] tests: make docker.py check for persistent configs, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 06/14] tests: make docker.py update use configured binfmt path, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 11/14] tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 10/14] tests/vm: move images to $HOME/.cache/qemu-vm/images,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 05/14] docker: disable Xen on CentOS 7, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 09/14] tests: PEP8 cleanup of docker.py, mostly white space, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 04/14] archive-source.sh: Clone the submodules locally, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 12/14] tests/vm: add --build-target option, Alex Bennée, 2019/01/25
- [Qemu-devel] [PATCH v1 14/14] scripts/qemu.py: allow arches use KVM for their 32bit cousins, Alex Bennée, 2019/01/25