| Message ID | 20190124115448.30487-1-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] tests/vm: move images to $HOME/.cache/qemu-vm/images | expand |
On 1/24/19 12:54 PM, Gerd Hoffmann wrote: > 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 <kraxel@redhat.com> > --- > > Notes: > v2: use $HOME/.cache/qemu-vm/images as location Thanks :) > > 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) \ > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Gerd Hoffmann <kraxel@redhat.com> writes: > 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 <kraxel@redhat.com> Queued to testing/next, thanks. > --- > > Notes: > v2: use $HOME/.cache/qemu-vm/images as location > > 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) \ -- Alex Bennée
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) \
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 <kraxel@redhat.com> --- Notes: v2: use $HOME/.cache/qemu-vm/images as location tests/vm/Makefile.include | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)