[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 05/25] tests/docker: remove test targets
From: |
Alex Bennée |
Subject: |
[PATCH v1 05/25] tests/docker: remove test targets |
Date: |
Tue, 19 Apr 2022 10:10:00 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220401141326.1244422-3-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 20 +-------------------
tests/docker/dockerfiles/empty.docker | 8 --------
2 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644 tests/docker/dockerfiles/empty.docker
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index a6a5a20949..06c40a9320 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -18,7 +18,7 @@ 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
# we don't directly build virtual images (they are used to build other images)
-DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain empty
+DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain
__IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(basename
$(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
DOCKER_IMAGES := $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__IMAGES))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
@@ -99,24 +99,6 @@ docker-binfmt-image-debian-%:
$(DOCKER_FILES_DIR)/debian-bootstrap.docker
{ echo "You will need to build $(EXECUTABLE)"; exit
1;},\
"CHECK", "debian-$* exists"))
-# These are test targets
-USER_TCG_TARGETS=$(patsubst %-linux-user,qemu-%,$(filter
%-linux-user,$(TARGET_DIRS)))
-EXEC_COPY_TESTS=$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS))
-
-$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.docker
- $(call quiet-command,
\
- $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $<
\
- $(if $V,,--quiet) --no-cache
\
- --include-executable=$*
\
- --skip-binfmt,
\
- "TEST","copy $* to container")
- $(call quiet-command,
\
- $(DOCKER_SCRIPT) run qemu/exec-copy-test-$*
\
- /$* -version > tests/docker-exec-copy-test-$*.out,
\
- "TEST","check $* works in container")
-
-docker-exec-copy-test: $(EXEC_COPY_TESTS)
-
endif
# Enforce dependencies for composite images
diff --git a/tests/docker/dockerfiles/empty.docker
b/tests/docker/dockerfiles/empty.docker
deleted file mode 100644
index 9ba980f1a8..0000000000
--- a/tests/docker/dockerfiles/empty.docker
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Empty Dockerfile
-#
-
-FROM scratch
-
-# Add everything from the context into the container
-ADD . /
--
2.30.2
- [PATCH v1 04/25] tests/docker: remove dead code for linux-user containers, (continued)
- [PATCH v1 04/25] tests/docker: remove dead code for linux-user containers, Alex Bennée, 2022/04/19
- [PATCH v1 03/25] docs/devel: drop :hidden: and :includehidden: tags, Alex Bennée, 2022/04/19
- [PATCH v1 10/25] tests/docker: simplify docker-TEST@IMAGE targets, Alex Bennée, 2022/04/19
- [PATCH v1 06/25] tests/docker: remove dead variable, Alex Bennée, 2022/04/19
- [PATCH v1 13/25] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak, Alex Bennée, 2022/04/19
- [PATCH v1 05/25] tests/docker: remove test targets,
Alex Bennée <=
- [PATCH v1 07/25] tests/docker: remove unnecessary default definitions, Alex Bennée, 2022/04/19
- [PATCH v1 11/25] tests/docker: do not duplicate rules for hexagon-cross, Alex Bennée, 2022/04/19
- [PATCH v1 09/25] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES), Alex Bennée, 2022/04/19
- [PATCH v1 14/25] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak, Alex Bennée, 2022/04/19
- [PATCH v1 12/25] tests/tcg: add compiler test variables when using containers, Alex Bennée, 2022/04/19