[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 51/54] tests/Makefile: call sub-makes with SKIP_D
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v7 51/54] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1 |
Date: |
Fri, 15 Jun 2018 20:47:02 +0100 |
As we now ensure all the images we are going to use are built in the
top level make file lets not over complicate things by running the
full script again. We do run the check script just in case someone
deletes the docker image while we are running.
Signed-off-by: Alex Bennée <address@hidden>
---
tests/Makefile.include | 8 ++++++--
tests/docker/Makefile.include | 13 ++++++++++++-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 2dd0700a88..dad20e1b9b 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -947,10 +947,14 @@ $(foreach PROBE_TARGET,$(TARGET_LIST),
\
$(eval build-tcg-tests-$(PROBE_TARGET): $(DOCKER_PREREQ))))
build-tcg-tests-%:
- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)"
TARGET_DIR="$*/" guest-tests,)
+ $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" \
+ SKIP_DOCKER_BUILD=1 TARGET_DIR="$*/" guest-tests, \
+ "BUILD", "TCG tests for $*")
run-tcg-tests-%: build-tcg-tests-%
- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)"
TARGET_DIR="$*/" run-guest-tests,)
+ $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" \
+ SKIP_DOCKER_BUILD=1 TARGET_DIR="$*/" run-guest-tests, \
+ "RUN", "TCG tests for $*")
clean-tcg-tests-%:
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)"
TARGET_DIR="$*/" clean-guest-tests,)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 87f449264f..c0f09505bb 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -34,7 +34,15 @@ docker-qemu-src: $(DOCKER_SRC_COPY)
docker-image: ${DOCKER_TARGETS}
-# General rule for building docker images
+# General rule for building docker images. If we are a sub-make
+# invoked with SKIP_DOCKER_BUILD we still check the image is upto date
+# though
+ifdef SKIP_DOCKER_BUILD
+docker-image-%: $(DOCKER_FILES_DIR)/%.docker
+ $(call quiet-command, \
+ $(DOCKER_SCRIPT) check --quiet qemu:$* $<, \
+ "CHECK", "$*")
+else
docker-image-%: $(DOCKER_FILES_DIR)/%.docker
@if test "$@" = docker-image-debian-bootstrap -a -z "$(EXECUTABLE)";
then \
echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1
; \
@@ -46,6 +54,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\
$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
"BUILD","$*")
+endif
# Enforce dependencies for composite images
docker-image-debian: docker-image-debian9
@@ -65,7 +74,9 @@ 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.
+ifndef SKIP_DOCKER_BUILD
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
--
2.17.1
- [Qemu-devel] [PATCH v7 30/54] tests/tcg/mips: include common mips hello-mips, (continued)
- [Qemu-devel] [PATCH v7 30/54] tests/tcg/mips: include common mips hello-mips, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 33/54] tests/tcg: enable building for Alpha, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 28/54] tests/tcg: enable building for MIPS, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 45/54] tests/Makefile.include: add [build|clean|check]-tcg targets, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 26/54] tests/tcg/arm: add fcvt test cases for AArch32/64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 16/54] tests/tcg/i386: Build fix for hello-i386, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 17/54] tests/tcg/i386: fix test-i386, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 39/54] tests/tcg: enable building for mips64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 29/54] tests/docker/Makefile.include: fix mipsel-cross dependancy, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 51/54] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1,
Alex Bennée <=
- [Qemu-devel] [PATCH v7 32/54] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 35/54] tests/tcg: enable building for HPPA, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 44/54] Makefile.target: add (clean-/build-)guest-tests targets, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 24/54] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 34/54] tests/tcg/alpha: add Alpha specific tests, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 46/54] tests/tcg: add run, diff, and skip helper macros, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 13/54] tests/tcg/multiarch: move most output to stdout, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 50/54] docker: docker.py add check sub-command, Alex Bennée, 2018/06/15