[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 48/49] tests/docker: prevent sub-makes re-buildin
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v6 48/49] tests/docker: prevent sub-makes re-building debian-sid |
Date: |
Fri, 8 Jun 2018 13:33:06 +0100 |
This is a bit of a hack but having ensured Debian SID is built at
least once in the top-level we don't need to do it over and over
again. Perhaps a better solution would be to have docker.py spit out
the dependency if a base image is too old?
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/Makefile.include | 6 +++++-
tests/tcg/Makefile.include | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 78568d7c61..3393e9f97d 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -63,8 +63,12 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe
# Debian SID images - we are tracking a rolling distro so we want to
# force a re-build of the base image if we ever need to build one of
-# its children.
+# its children. However when doing check-tcg we ensure everything is
+# built at top-level make so we can dispense with NOCACHE here to
+# avoid excessive re-builds.
+ifneq ($(SUBMAKE_NOCACHE_HACK),y)
docker-image-debian-sid: NOCACHE=1
+endif
docker-image-debian-alpha-cross: docker-image-debian-sid
docker-image-debian-hppa-cross: docker-image-debian-sid
diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include
index 4851df0951..951f40c28d 100644
--- a/tests/tcg/Makefile.include
+++ b/tests/tcg/Makefile.include
@@ -39,6 +39,7 @@ ifeq ($(HAVE_USER_DOCKER)$(GUEST_BUILD),y)
ifneq ($(DOCKER_IMAGE),)
# We also need the Docker make rules to depend on
+SUBMAKE_NOCACHE_HACK=y
include $(SRC_PATH)/tests/docker/Makefile.include
DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \
--
2.17.1
- [Qemu-devel] [PATCH v6 26/49] tests/tcg: move MIPS specific tests into subdir, (continued)
- [Qemu-devel] [PATCH v6 26/49] tests/tcg: move MIPS specific tests into subdir, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 37/49] tests/tcg: enable building for mips64, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 33/49] tests/tcg: enable building for HPPA, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 23/49] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 44/49] tests/tcg: add run, diff, and skip helper macros, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 46/49] target/sh4: Fix translator.c assertion failure for gUSA, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 40/49] tests/tcg: enable building for PowerPC, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 48/49] tests/docker: prevent sub-makes re-building debian-sid,
Alex Bennée <=
- [Qemu-devel] [PATCH v6 29/49] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 28/49] tests/tcg/mips: include common mips hello-mips, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 15/49] tests/tcg/i386: Build fix for hello-i386, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 19/49] tests/tcg/i386/test-i386: use modern vector_size attributes, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 13/49] tests/tcg: move i386 specific tests into subdir, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 20/49] tests/tcg/i386/test-i386: fix printf format, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 39/49] docker: move debian-powerpc-cross to sid based build, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 30/49] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/08
- [Qemu-devel] [PATCH v6 41/49] tests/tcg/Makefile: update to be called from Makefile.target, Alex Bennée, 2018/06/08