qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 01/17] tests/docker: expose $HOME/.cache/qemu as docker volume
Date: Thu,  5 Jun 2025 17:26:34 +0100	[thread overview]
Message-ID: <20250605162651.2614401-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20250605162651.2614401-1-alex.bennee@linaro.org>

If you want to run functional tests we should share .cache/qemu so we
don't force containers to continually re-download images. We also move
ccache to use this shared area.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-ID: <20250603110204.838117-2-alex.bennee@linaro.org>

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index fa1cbb6726..3959d8a028 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -185,8 +185,10 @@ docker:
 
 docker-help: docker
 
+# Where QEMU caches build artefacts
+DOCKER_QEMU_CACHE_DIR := $$HOME/.cache/qemu
 # Use a global constant ccache directory to speed up repetitive builds
-DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
+DOCKER_QEMU_CCACHE_DIR := DOCKER_QEMU_CACHE_DIR/docker-ccache
 
 # This rule if for directly running against an arbitrary docker target.
 # It is called by the expanded docker targets (e.g. make
@@ -195,7 +197,7 @@ DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
 # For example: make docker-run TEST="test-quick" IMAGE="debian:arm64" EXECUTABLE=./aarch64-linux-user/qemu-aarch64
 #
 docker-run: docker-qemu-src
-	@mkdir -p "$(DOCKER_CCACHE_DIR)"
+	@mkdir -p "$(DOCKER_QEMU_CCACHE_DIR)"
 	@if test -z "$(IMAGE)" || test -z "$(TEST)"; \
 		then echo "Invalid target $(IMAGE)/$(TEST)"; exit 1; \
 	fi
@@ -222,8 +224,8 @@ docker-run: docker-qemu-src
 			-e V=$V -e J=$J -e DEBUG=$(DEBUG)		\
 			-e SHOW_ENV=$(SHOW_ENV) 			\
 			$(if $(NOUSER),,				\
-				-e CCACHE_DIR=/var/tmp/ccache 		\
-				-v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
+				-v $(DOCKER_QEMU_CACHE_DIR):$(DOCKER_QEMU_CACHE_DIR) 	\
+				-e CCACHE_DIR=$(DOCKER_QEMU_CCACHE_DIR)	\
 			)						\
 			-v $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \
 			$(IMAGE) 					\
-- 
2.47.2



  reply	other threads:[~2025-06-05 16:27 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-05 16:26 [PULL 00/17] maintainer updates for May (testing, plugins, virtio-gpu) Alex Bennée
2025-06-05 16:26 ` Alex Bennée [this message]
2025-06-05 16:26 ` [PULL 02/17] gitlab: disable debug info on CI builds Alex Bennée
2025-06-05 16:26 ` [PULL 03/17] tests/tcg: make aarch64 boot.S handle different starting modes Alex Bennée
2025-06-05 16:26 ` [PULL 04/17] tests/qtest: Avoid unaligned access in IGB test Alex Bennée
2025-06-06  9:29   ` Akihiko Odaki
2025-06-05 16:26 ` [PULL 05/17] contrib/plugins: add a scaling factor to the ips arg Alex Bennée
2025-06-05 16:26 ` [PULL 06/17] contrib/plugins: allow setting of instructions per quantum Alex Bennée
2025-06-05 16:26 ` [PULL 07/17] MAINTAINERS: add myself to virtio-gpu for Odd Fixes Alex Bennée
2025-06-05 16:26 ` [PULL 08/17] MAINTAINERS: add Akihiko and Dmitry as reviewers Alex Bennée
2025-06-05 16:26 ` [PULL 09/17] hw/display: re-arrange memory region tracking Alex Bennée
2025-06-06  5:17   ` Akihiko Odaki
2025-06-06  9:54     ` Alex Bennée
2025-06-06 10:31       ` Akihiko Odaki
2025-06-06 11:31         ` Alex Bennée
2025-06-06 15:06           ` Akihiko Odaki
2025-06-05 16:26 ` [PULL 10/17] virtio-gpu: refactor async blob unmapping Alex Bennée
2025-06-08  8:16   ` Akihiko Odaki
2025-06-05 16:26 ` [PULL 11/17] ui/gtk-gl-area: Remove extra draw call in refresh Alex Bennée
2025-06-05 16:26 ` [PULL 12/17] virtio-gpu: support context init multiple timeline Alex Bennée
2025-06-08  8:23   ` Akihiko Odaki
2025-06-20  2:07     ` Yiwei Zhang
2025-06-20  6:45       ` Alex Bennée
2025-06-20 19:47         ` Yiwei Zhang
2025-06-21  5:59           ` Akihiko Odaki
2025-06-05 16:26 ` [PULL 13/17] include/exec: fix assert in size_memop Alex Bennée
2025-06-08  8:29   ` Akihiko Odaki
2025-06-05 16:26 ` [PULL 14/17] include/gdbstub: fix include guard in commands.h Alex Bennée
2025-06-05 16:26 ` [PULL 15/17] gdbstub: assert earlier in handle_read_all_regs Alex Bennée
2025-06-05 16:26 ` [PULL 16/17] gdbstub: Implement qGDBServerVersion packet Alex Bennée
2025-06-05 16:26 ` [PULL 17/17] gdbstub: update aarch64-core.xml Alex Bennée
2025-06-06 13:45 ` [PULL 00/17] maintainer updates for May (testing, plugins, virtio-gpu) Stefan Hajnoczi
2025-06-07 15:44   ` Alex Bennée

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=20250605162651.2614401-2-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /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).