[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] docker: Do not run tests in 'intermediate' imag
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 6/8] docker: Do not run tests in 'intermediate' images |
Date: |
Thu, 28 Jun 2018 13:46:41 -0300 |
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>
---
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 7d9d568eee..301ee68ae6 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
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
@@ -98,7 +100,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), \
$(eval .PHONY: address@hidden) \
$(eval address@hidden: docker-image-$i address@hidden) \
--
2.18.0
- [Qemu-devel] [PATCH 1/8] docker: ubuntu: Update the package list before installing new ones, (continued)
- [Qemu-devel] [PATCH 1/8] docker: ubuntu: Update the package list before installing new ones, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 2/8] docker: ubuntu: Use SDL2, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 3/8] docker: Clean the MXE base image, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [RFC PATCH 4/8] docker: Add packages required to build a Linux kernel, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [RFC PATCH 5/8] docker: Restrict the 'travis' job to the Travis image, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 6/8] docker: Do not run tests in 'intermediate' images,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 8/8] .shippable.yml: Restore the powerpc-cross image, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 7/8] docker: Cross build QEMU on ppc32 hosts, Philippe Mathieu-Daudé, 2018/06/28
- Re: [Qemu-devel] [PATCH 0/8] Docker improvements, Alex Bennée, 2018/06/29