[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/16] tests/docker: add a docker-exec-copy-test
From: |
Alex Bennée |
Subject: |
[PULL 07/16] tests/docker: add a docker-exec-copy-test |
Date: |
Mon, 8 Feb 2021 12:38:12 +0000 |
This provides test machinery for checking the QEMU copying logic works
properly. It takes considerably less time to run than starting a
debootstrap only for it to fail later. I considered adding a remove
command to docker.py but figured that might be gold plating given the
relative size of the containers compared to the ones with actual stuff
in them.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210202134001.25738-7-alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index a5c1e4a615..93b29ad823 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -11,7 +11,7 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
DOCKER_SUFFIX := .docker
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 debian-bootstrap
+DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap empty
DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard
$(DOCKER_FILES_DIR)/*.docker))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
@@ -92,6 +92,24 @@ 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/docker.py b/tests/docker/docker.py
index 39da3fefcf..d28df4c140 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -438,6 +438,9 @@ class BuildCommand(SubCommand):
help="""Specify a binary that will be copied to the
container together with all its dependent
libraries""")
+ parser.add_argument("--skip-binfmt",
+ action="store_true",
+ help="""Skip binfmt entry check (used for
testing)""")
parser.add_argument("--extra-files", nargs='*',
help="""Specify files that will be copied in the
Docker image, fulfilling the ADD directive from the
@@ -466,7 +469,9 @@ class BuildCommand(SubCommand):
docker_dir = tempfile.mkdtemp(prefix="docker_build")
# Validate binfmt_misc will work
- if args.include_executable:
+ if args.skip_binfmt:
+ qpath = args.include_executable
+ elif args.include_executable:
qpath, enabled = _check_binfmt_misc(args.include_executable)
if not enabled:
return 1
diff --git a/tests/docker/dockerfiles/empty.docker
b/tests/docker/dockerfiles/empty.docker
new file mode 100644
index 0000000000..9ba980f1a8
--- /dev/null
+++ b/tests/docker/dockerfiles/empty.docker
@@ -0,0 +1,8 @@
+#
+# Empty Dockerfile
+#
+
+FROM scratch
+
+# Add everything from the context into the container
+ADD . /
--
2.20.1
- [PULL 00/16] testing, gdbstub and doc tweaks, Alex Bennée, 2021/02/08
- [PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image, Alex Bennée, 2021/02/08
- [PULL 05/16] tests/docker: preserve original name when copying libs, Alex Bennée, 2021/02/08
- [PULL 11/16] gdbstub: Fix handle_query_xfer_auxv, Alex Bennée, 2021/02/08
- [PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files, Alex Bennée, 2021/02/08
- [PULL 08/16] configure: make version_ge more tolerant of shady version input, Alex Bennée, 2021/02/08
- [PULL 03/16] tests/docker: Fix typo in help message, Alex Bennée, 2021/02/08
- [PULL 12/16] tests/tcg: Replace /bin/true by true (required on macOS), Alex Bennée, 2021/02/08
- [PULL 07/16] tests/docker: add a docker-exec-copy-test,
Alex Bennée <=
- [PULL 06/16] tests/docker: alias docker-help target for consistency, Alex Bennée, 2021/02/08
- [PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it, Alex Bennée, 2021/02/08
- [PULL 01/16] tests/acceptance: Increase the timeout in the replay tests, Alex Bennée, 2021/02/08
- [PULL 10/16] tests/tcg: don't silently skip the gdb tests, Alex Bennée, 2021/02/08
- [PULL 09/16] configure: bump the minimum gdb version for check-tcg to 9.1, Alex Bennée, 2021/02/08
- [PULL 15/16] docs/system: document an example vexpress-a15 invocation, Alex Bennée, 2021/02/08
- [PULL 16/16] docs/system: document an example booting the versatilepb machine, Alex Bennée, 2021/02/08
- [PULL 14/16] tests/Makefile.include: don't use TARGET_DIRS for check-tcg, Alex Bennée, 2021/02/08
- Re: [PULL 00/16] testing, gdbstub and doc tweaks, Peter Maydell, 2021/02/08