[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/21] tests/docker: split PARTIAL into PARTIAL and VIRTUAL images
From: |
Alex Bennée |
Subject: |
[PULL 07/21] tests/docker: split PARTIAL into PARTIAL and VIRTUAL images |
Date: |
Wed, 3 Nov 2021 17:05:44 +0000 |
This is mostly to ensure we don't include the toolchain and bootstrap
builds in DOCKER_IMAGES which is useful when verifying all images
still build.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211026102234.3961636-10-alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index e943ac33b0..5bbbaceed1 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -11,8 +11,10 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap empty
-DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard
$(DOCKER_FILES_DIR)/*.docker))))
+DOCKER_PARTIAL_IMAGES := debian10 debian11
+# we don't directly build virtual images (they are used to build other images)
+DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain empty
+DOCKER_IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(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
DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
@@ -204,7 +206,7 @@ DOCKER_PARTIAL_IMAGES += fedora-cris-cross
# packages.
# Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
+$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES)
$(DOCKER_VIRTUAL_IMAGES),$(DOCKER_IMAGES)), \
$(foreach t,$(DOCKER_TESTS), \
$(eval .PHONY: docker-$t@$i) \
$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
--
2.30.2
- [PULL for 6.2 00/21] testing, plugin and gdbstub updates, Alex Bennée, 2021/11/03
- [PULL 02/21] gitlab-ci: Remove special casing for hexagon testing, Alex Bennée, 2021/11/03
- [PULL 03/21] tests/docker: Add debian-nios2-cross image, Alex Bennée, 2021/11/03
- [PULL 01/21] tests/docker: Update debian-hexagon-cross to a newer toolchain, Alex Bennée, 2021/11/03
- [PULL 04/21] tests/docker: Add debian-microblaze-cross image, Alex Bennée, 2021/11/03
- [PULL 06/21] tests/tcg: Fix some targets default cross compiler path, Alex Bennée, 2021/11/03
- [PULL 05/21] tests/tcg: Enable container_cross_cc for microblaze, Alex Bennée, 2021/11/03
- [PULL 07/21] tests/docker: split PARTIAL into PARTIAL and VIRTUAL images,
Alex Bennée <=
- [PULL 10/21] plugins/cache: freed heap-allocated mutexes, Alex Bennée, 2021/11/03
- [PULL 11/21] plugins/cache: implement unified L2 cache emulation, Alex Bennée, 2021/11/03
- [PULL 09/21] ebpf: really include it only in system emulators, Alex Bennée, 2021/11/03
- [PULL 08/21] tests/tcg: enable debian-nios2-cross for test building, Alex Bennée, 2021/11/03
- [PULL 14/21] docs/tcg-plugins: add L2 arguments to cache docs, Alex Bennée, 2021/11/03
- [PULL 13/21] plugins/cache: make L2 emulation optional through args, Alex Bennée, 2021/11/03
- [PULL 18/21] tests/tcg: remove duplicate EXTRA_RUNS, Alex Bennée, 2021/11/03
- [PULL 21/21] tests/vm/openbsd: Update to release 7.0, Alex Bennée, 2021/11/03
- [PULL 19/21] gdbstub: Switch to the thread receiving a signal, Alex Bennée, 2021/11/03
- [PULL 16/21] tests/plugins: extend the insn plugin to track opcode sizes, Alex Bennée, 2021/11/03