[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/15] tests/docker: remove SKIP_DOCKER_BUILD
From: |
Paolo Bonzini |
Subject: |
[PATCH 14/15] tests/docker: remove SKIP_DOCKER_BUILD |
Date: |
Mon, 28 Mar 2022 10:02:39 -0400 |
It is now unused.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/docker/Makefile.include | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index e1bea20451..1b10585f28 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -33,15 +33,7 @@ $(DOCKER_SRC_COPY):
docker-qemu-src: $(DOCKER_SRC_COPY)
-# General rule for building docker images. If we are a sub-make
-# invoked with SKIP_DOCKER_BUILD we still check the image is up to date
-# though
-ifdef SKIP_DOCKER_BUILD
-docker-image-%: $(DOCKER_FILES_DIR)/%.docker
- $(call quiet-command, \
- $(DOCKER_SCRIPT) check --quiet qemu/$* $<, \
- "CHECK", "$*")
-else
+# General rule for building docker images.
docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(call quiet-command,\
$(DOCKER_SCRIPT) build -t qemu/$* -f $< \
@@ -77,8 +69,6 @@ docker-binfmt-image-debian-%:
$(DOCKER_FILES_DIR)/debian-bootstrap.docker
{ echo "You will need to build $(EXECUTABLE)"; exit
1;},\
"CHECK", "debian-$* exists"))
-endif
-
# Enforce dependencies for composite images
# we don't run tests on intermediate images (used as base by another image)
DOCKER_PARTIAL_IMAGES := debian10 debian11
--
2.31.1
- [PATCH 00/15] tests/docker and tests/tcg cleanup and diet, Paolo Bonzini, 2022/03/28
- [PATCH 02/15] tests/docker: remove test targets, Paolo Bonzini, 2022/03/28
- [PATCH 05/15] tests/docker: inline variable definitions or move close to use, Paolo Bonzini, 2022/03/28
- [PATCH 08/15] tests/tcg: add compiler test variables when using containers, Paolo Bonzini, 2022/03/28
- [PATCH 14/15] tests/docker: remove SKIP_DOCKER_BUILD,
Paolo Bonzini <=
- [PATCH 01/15] tests/docker: remove dead code, Paolo Bonzini, 2022/03/28
- [PATCH 04/15] tests/docker: remove unnecessary default definitions, Paolo Bonzini, 2022/03/28
- [PATCH 13/15] tests/tcg: invoke Makefile.target directly from QEMU's makefile, Paolo Bonzini, 2022/03/28
- [PATCH 03/15] tests/docker: remove dead variable, Paolo Bonzini, 2022/03/28
- [PATCH 10/15] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak, Paolo Bonzini, 2022/03/28