[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate'
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate' images |
Date: |
Fri, 29 Jun 2018 21:52:26 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
We can still build the DOCKER_INTERMEDIATE_IMAGES images,
but they won't appear in 'make address@hidden'.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/Makefile.include | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 1813ec0781..8641f5da2c 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -5,6 +5,8 @@
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
DOCKER_DEPRECATED_IMAGES := debian
+# we don't run tests on intermediate images (used as base by another image)
+DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports
debian-sid
DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir
$(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
@@ -101,7 +103,7 @@ docker-image-travis: NOUSER=1
docker-image-tricore-cross: docker-image-debian9
# Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \
+$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES)
$(DOCKER_DEPRECATED_IMAGES)), \
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
$(eval .PHONY: address@hidden) \
$(eval address@hidden: docker-image-$i address@hidden) \
--
2.17.1
- [Qemu-devel] [PATCH v2 21/21] .shippable.yml: add linux-user cross-build for ppc-softmmu, (continued)
- [Qemu-devel] [PATCH v2 21/21] .shippable.yml: add linux-user cross-build for ppc-softmmu, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 13/21] docker: ubuntu: Use SDL2, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 11/21] docker: filter out linux-user builds for mingw, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 12/21] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 09/21] linux-user: introduce preexit_cleanup, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build step, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debian-%-user targets, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 19/21] docker: add special rule for deboostrapped images, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 20/21] docker: add linux-user powered cross builder for QEMU, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 17/21] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate' images,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 14/21] docker: Clean the MXE base image, Alex Bennée, 2018/06/29