[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/17] tests/docker: remove test targets
From: |
Paolo Bonzini |
Subject: |
[PATCH 02/17] tests/docker: remove test targets |
Date: |
Fri, 1 Apr 2022 16:13:11 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220328140240.40798-3-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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.35.1
- [PATCH 00/17] tests/docker and tests/tcg cleanup and diet, Paolo Bonzini, 2022/04/01
- [PATCH 01/17] tests/docker: remove dead code for linux-user containers, Paolo Bonzini, 2022/04/01
- [PATCH 02/17] tests/docker: remove test targets,
Paolo Bonzini <=
- [PATCH 03/17] tests/docker: remove dead variable, Paolo Bonzini, 2022/04/01
- [PATCH 04/17] tests/docker: remove unnecessary default definitions, Paolo Bonzini, 2022/04/01
- [PATCH 06/17] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES), Paolo Bonzini, 2022/04/01
- [PATCH 05/17] tests/docker: inline variable definitions or move close to use, Paolo Bonzini, 2022/04/01
- [PATCH 07/17] tests/docker: simplify docker-TEST@IMAGE targets, Paolo Bonzini, 2022/04/01
- [PATCH 09/17] tests/tcg: add compiler test variables when using containers, Paolo Bonzini, 2022/04/01
- [PATCH 10/17] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak, Paolo Bonzini, 2022/04/01
- [PATCH 11/17] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak, Paolo Bonzini, 2022/04/01
- [PATCH 08/17] tests/docker: do not duplicate rules for hexagon-cross, Paolo Bonzini, 2022/04/01
- [PATCH 12/17] tests/tcg: prepare Makefile.prereqs at configure time, Paolo Bonzini, 2022/04/01