From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PULL 12/18] tests/vm: move images to $HOME/.cache/qemu-vm/images
Date: Mon, 11 Feb 2019 13:05:01 +0000 [thread overview]
Message-ID: <20190211130507.8710-13-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org>
From: Gerd Hoffmann <kraxel@redhat.com>
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
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.20.1
next prev parent reply other threads:[~2019-02-11 13:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 13:04 [Qemu-devel] [PULL 00/18] testing updates: travis/cirrus/vm-test/binfmt Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 01/18] .cirrus.yml: basic compile and test for FreeBSD Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 02/18] .travis.yml: stop requesting libffi & gettext from homebrew Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 03/18] .travis.yml: separate tools and docs into another entry Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 04/18] .travis.yml: fold --disable-tcg into alternate coroutine builds Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 05/18] MAINTAINERS: Add an entry for scripts/archive-source.sh Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 06/18] archive-source.sh: Clone the submodules locally Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 07/18] docker: add debian-buster-arm64-cross Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 08/18] tests: make docker.py update use configured binfmt path Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 09/18] tests: make docker.py check for persistent configs Alex Bennée
2019-02-11 13:04 ` [Qemu-devel] [PULL 10/18] tests: docker.py be even smarter with persistent binfmt_misc Alex Bennée
2019-02-11 13:05 ` [Qemu-devel] [PULL 11/18] tests: PEP8 cleanup of docker.py, mostly white space Alex Bennée
2019-02-11 13:05 ` Alex Bennée [this message]
2019-02-11 13:05 ` [Qemu-devel] [PULL 13/18] tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386 Alex Bennée
2019-02-11 13:05 ` [Qemu-devel] [PULL 14/18] tests/vm: add --build-target option Alex Bennée
2019-02-11 13:05 ` [Qemu-devel] [PULL 15/18] tests/vm: expose BUILD_TARGET, TARGET_LIST and EXTRA_CONFIGURE_OPTS Alex Bennée
2019-02-11 13:05 ` [Qemu-devel] [PULL 16/18] scripts/qemu.py: allow arches use KVM for their 32bit cousins Alex Bennée
2019-02-11 13:05 ` [Qemu-devel] [PULL 17/18] docs/devel/testing: Add -a option to usermod command on docker setup Alex Bennée
2019-02-11 13:05 ` [Qemu-devel] [PULL 18/18] tests/vm: Be verbose while extracting compressed images Alex Bennée
2019-02-11 13:14 ` Philippe Mathieu-Daudé
2019-02-11 16:08 ` [Qemu-devel] [PULL 00/18] testing updates: travis/cirrus/vm-test/binfmt Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190211130507.8710-13-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).