projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79bd3ae
)
tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES)
author
Paolo Bonzini
<pbonzini@redhat.com>
Tue, 19 Apr 2022 09:10:04 +0000
(10:10 +0100)
committer
Alex Bennée
<alex.bennee@linaro.org>
Wed, 20 Apr 2022 15:04:20 +0000
(16:04 +0100)
Now that DOCKER_IMAGES is only defined after DOCKER_VIRTUAL_IMAGES is
complete, there is no need to re-filter DOCKER_IMAGES against it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <
20220401141326
.
1244422
-7-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
-10-alex.bennee@linaro.org>
tests/docker/Makefile.include
patch
|
blob
|
history
diff --git
a/tests/docker/Makefile.include
b/tests/docker/Makefile.include
index 9b4d1cf83752cdf2ef418f83e1ac106eed260eea..3b5ebd556707ea18c1468e8679a94d5bef60b193 100644
(file)
--- a/
tests/docker/Makefile.include
+++ b/
tests/docker/Makefile.include
@@
-201,7
+201,7
@@
__TESTS := $(notdir $(shell find $(SRC_PATH)/tests/docker/ -name 'test-*' -type
DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS))
# Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES)
$(DOCKER_VIRTUAL_IMAGES)
,$(DOCKER_IMAGES)), \
+$(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) \