tests/vm: move images to subdirectory
PATCH 1/1 tests/vm: move images to subdirectory
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 <[email protected]>
--- tests/vm/.gitignore | 1 + tests/vm/Makefile.include | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 tests/vm/.gitignore
tests/vm/.gitignore new file +1 -0
@@ -0,0 +1 @@ +images
tests/vm/Makefile.include +6 -5
@@ -3,7 +3,7 @@ .PHONY: vm-build-all vm-clean-all IMAGES := ubuntu.i386 freebsd netbsd openbsd centos -IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES)) +IMAGE_FILES := $(patsubst %, tests/vm/images/%.img, $(IMAGES)) .PRECIOUS: $(IMAGE_FILES)
@@ -24,9 +24,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 +tests/vm/images/%.img: $(SRC_PATH)/tests/vm/% \ + $(SRC_PATH)/tests/vm/basevm.py \ + $(SRC_PATH)/tests/vm/Makefile.include + @mkdir -p tests/vm/images $(call quiet-command, \ $< \ $(if $(V)$(DEBUG), --debug) \
@@ -37,7 +38,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \ # Build in VM $(IMAGE) -vm-build-%: tests/vm/%.img +vm-build-%: tests/vm/images/%.img $(call quiet-command, \ $(SRC_PATH)/tests/vm/$* \ $(if $(V)$(DEBUG), --debug) \
Signature · 1 line
2.9.3
Hi Gerd,
Quoted 3 lines · Gerd Hoffmann
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.
Good idea!
Quoted 20 lines
Signed-off-by Gerd Hoffmann <[email protected]>--- tests/vm/.gitignore | 1 + tests/vm/Makefile.include | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 tests/vm/.gitignoretests/vm/.gitignore new file +1
-0@@ -0,0 +1 @@ +imagestests/vm/Makefile.include +0
-0
tests/vm/Makefile.include line 6
Quoted 5 lines
tests/vm/Makefile.include +1
-1@@ -3,7 +3,7 @@ .PHONY: vm-build-all vm-clean-all IMAGES := ubuntu.i386 freebsd netbsd openbsd centos -IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES)) +IMAGE_FILES := $(patsubst %, tests/vm/images/%.img, $(IMAGES))
We already store the compressed image in ~/.cache/qemu-vm/download, what about having:
IMAGES_DIR ?= $$HOME/.cache/qemu-vm/images IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
Anyway I can send that on top of your patch, so meanwhile:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 27 lines
tests/vm/Makefile.include +5
-4.PRECIOUS: $(IMAGE_FILES)@@ -24,9 +24,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 +tests/vm/images/%.img: $(SRC_PATH)/tests/vm/% \ + $(SRC_PATH)/tests/vm/basevm.py \ + $(SRC_PATH)/tests/vm/Makefile.include + @mkdir -p tests/vm/images $(call quiet-command, \ $< \ $(if $(V)$(DEBUG), --debug) \@@ -37,7 +38,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \ # Build in VM $(IMAGE) -vm-build-%: tests/vm/%.img +vm-build-%: tests/vm/images/%.img $(call quiet-command, \ $(SRC_PATH)/tests/vm/$* \ $(if $(V)$(DEBUG), --debug) \