[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/25] tests/docker: simplify docker-TEST@IMAGE targets
From: |
Alex Bennée |
Subject: |
[PULL 10/25] tests/docker: simplify docker-TEST@IMAGE targets |
Date: |
Wed, 20 Apr 2022 19:08:17 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
No need to go through the shell when we already have the test and images at
the point where the targets are declared.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220401141326.1244422-8-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220419091020.3008144-11-alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 3b5ebd5567..2a187cb5a2 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -204,7 +204,7 @@ DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS),
$(__TESTS)), $(__TESTS))
$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
$(foreach t,$(DOCKER_TESTS), \
$(eval .PHONY: docker-$t@$i) \
- $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
+ $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run
TEST=$t IMAGE=$i) \
) \
$(foreach t,$(DOCKER_TESTS), \
$(eval docker-all-tests: docker-$t@$i) \
@@ -263,7 +263,7 @@ DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
# This rule if for directly running against an arbitrary docker target.
# It is called by the expanded docker targets (e.g. make
-# docker-test-foo@bar) which will do additional verification.
+# docker-test-foo@bar) which will also ensure the image is up to date.
#
# For example: make docker-run TEST="test-quick" IMAGE="debian:arm64"
EXECUTABLE=./aarch64-linux-user/qemu-aarch64
#
@@ -298,14 +298,6 @@ docker-run: docker-qemu-src
$(call quiet-command, rm -r $(DOCKER_SRC_COPY), \
" CLEANUP $(DOCKER_SRC_COPY)")
-# Run targets:
-#
-# Of the form docker-TEST-FOO@IMAGE-BAR which will then be expanded into a
call to "make docker-run"
-docker-run-%: CMD = $(shell echo '$@' | sed -e
's/docker-run-\([^@]*\)@\(.*\)/\1/')
-docker-run-%: IMAGE = $(shell echo '$@' | sed -e
's/docker-run-\([^@]*\)@\(.*\)/\2/')
-docker-run-%:
- @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu/$(IMAGE)
-
docker-image: ${DOCKER_IMAGES:%=docker-image-%}
docker-clean:
--
2.30.2
- [PULL 00/25] Various testing, doc and gdbstub fixes, Alex Bennée, 2022/04/20
- [PULL 01/25] tests/avocado: update aarch64_virt test to exercise -cpu max, Alex Bennée, 2022/04/20
- [PULL 03/25] docs/devel: drop :hidden: and :includehidden: tags, Alex Bennée, 2022/04/20
- [PULL 04/25] tests/docker: remove dead code for linux-user containers, Alex Bennée, 2022/04/20
- [PULL 02/25] docs/devel: add some notes on the binfmt-image-debian targets, Alex Bennée, 2022/04/20
- [PULL 06/25] tests/docker: remove dead variable, Alex Bennée, 2022/04/20
- [PULL 07/25] tests/docker: remove unnecessary default definitions, Alex Bennée, 2022/04/20
- [PULL 10/25] tests/docker: simplify docker-TEST@IMAGE targets,
Alex Bennée <=
- [PULL 05/25] tests/docker: remove test targets, Alex Bennée, 2022/04/20
- [PULL 09/25] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES), Alex Bennée, 2022/04/20
- [PULL 13/25] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak, Alex Bennée, 2022/04/20
- [PULL 16/25] tests/tcg: list test targets in Makefile.prereqs, Alex Bennée, 2022/04/20
- [PULL 21/25] tests/tcg: remove duplicate sha512-sse case, Alex Bennée, 2022/04/20
- [PULL 08/25] tests/docker: inline variable definitions or move close to use, Alex Bennée, 2022/04/20
- [PULL 14/25] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak, Alex Bennée, 2022/04/20
- [PULL 15/25] tests/tcg: prepare Makefile.prereqs at configure time, Alex Bennée, 2022/04/20
- [PULL 18/25] tests/tcg: isolate from QEMU's config-host.mak, Alex Bennée, 2022/04/20
- [PULL 20/25] tests/tcg: fix non-static build, Alex Bennée, 2022/04/20