[Qemu-devel] [PATCH v2 02/15] Makefile: Rules for docker testing

[Fam Zheng]

This adds a group of make targets to run docker tests, all are available
in source tree without running ./configure.

The usage is shown by "make docker".

Besides the fixed ones, dynamic targets for building each image and
running each test in each image are generated automatically by make,
scanning $(SRC_PATH)/tests/docker/ files with specific patterns.

Alternative to manually list particular targets (address@hidden)
set, you can control which tests/images to run by filtering variables,
TESTS= and IMAGES=, which are expressed in Makefile pattern syntax,
"foo% %bar ...". For example:

    $ make docker-run IMAGES="ubuntu fedora"

Unfortunately, it's impossible to propagate "-j $JOBS" into make in
containers, however since each combination is made a first class target
is the top Makefile, "make -j$N docker-run" still parallels the tests
coarsely.

Signed-off-by: Fam Zheng <address@hidden>
---
 Makefile                      |  4 +-
 tests/docker/Makefile.include | 93 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 tests/docker/Makefile.include

diff --git a/Makefile b/Makefile
index f9fae3a..f104a08 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ BUILD_DIR=$(CURDIR)
 # Before including a proper config-host.mak, assume we are in the source tree
 SRC_PATH=.
 
-UNCHECKED_GOALS := %clean TAGS cscope ctags
+UNCHECKED_GOALS := %clean TAGS cscope ctags docker docker-%
 
 # All following code might depend on configuration variables
 ifneq ($(wildcard config-host.mak),)
@@ -651,3 +651,5 @@ endif
 # Include automatically generated dependency files
 # Dependencies in Makefile.objs files come from our recursive subdir rules
 -include $(wildcard *.d tests/*.d)
+
+include $(SRC_PATH)/tests/docker/Makefile.include
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
new file mode 100644
index 0000000..d8c55c3
--- /dev/null
+++ b/tests/docker/Makefile.include
@@ -0,0 +1,93 @@
+# Makefile for Docker tests
+
+$(if $(quiet-command),,$(eval include $(SRC_PATH)/rules.mak))
+
+.PHONY: docker docker-test docker-clean docker-image
+
+DOCKER_SUFFIX := .docker
+
+DOCKER_IMAGES := $(notdir $(basename \
+       $(wildcard $(SRC_PATH)/tests/docker/dockerfiles/*)))
+
+DOCKER_TESTS := $(notdir $(shell \
+       find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f -executable))
+
+DOCKER_TOOLS := travis
+
+TESTS ?= %
+IMAGES ?= %
+
+$(foreach i,$(DOCKER_IMAGES), \
+       $(eval docker-image: docker-image-$i) \
+       $(eval docker-image-$i: IMAGE = $i) \
+       $(eval .PHONY: docker-image-$i address@hidden) \
+       $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
+               $(eval .PHONY: address@hidden) \
+               $(eval address@hidden: docker-image-$i) \
+               $(eval address@hidden: address@hidden) \
+               $(eval address@hidden: address@hidden) \
+               $(eval docker-test: address@hidden) \
+       ) \
+)
+
+docker:
+       @echo 'Building QEMU and running tests inside Docker containers'
+       @echo
+       @echo 'Available targets:'
+       @echo
+       @echo '    docker:              Print this help.'
+       @echo '    docker-test:         Run all image/test combinations.'
+       @echo '    docker-clean:        Kill and remove residual docker testing 
containers.'
+       @echo '    address@hidden:   Run "TEST" in container "IMAGE".'
+       @echo '                         Note: "TEST" is one of the listed test 
name,'
+       @echo '                         or a script name under 
$$QEMU_SRC/tests/docker/;'
+       @echo '                         "IMAGE" is one of the listed container 
name."'
+       @echo '    address@hidden:       Run all tests in container "IMAGE".'
+       @echo '    docker-image:        Build all images.'
+       @echo '    docker-image-IMAGE:  Build image "IMG".'
+       @echo
+       @echo 'Available container images:'
+       @echo '    $(DOCKER_IMAGES)'
+       @echo
+       @echo 'Available tests:'
+       @echo '    $(DOCKER_TESTS)'
+       @echo
+       @echo 'Available tools:'
+       @echo '    $(DOCKER_TOOLS)'
+       @echo
+       @echo 'Special variables:'
+       @echo '    IMAGES="a b c ..":   Filters which images to build or run.'
+       @echo '    TESTS="x y z .."     Filters which tests to run (for 
docker-test).'
+       @echo '    J=[0..9]*            Overrides the -jN parameter for make 
commands'
+       @echo '                         (default is 1)'
+
+docker-image-%:
+       @if test -z "$(IMAGE)"; then echo "Invalid target"; exit 1; fi
+       $(if $(filter $(IMAGES),$(IMAGE)), $(call quiet-command,\
+               $(SRC_PATH)/tests/docker/docker_build qemu:$(IMAGE) \
+                       $(SRC_PATH)/tests/docker/dockerfiles/$(IMAGE).docker \
+                       $(if $V,-v,), "  BUILD $(IMAGE)"))
+
+
+docker-run-%: CMD = $(shell echo '$@' | sed -e 
's/docker-run-\(address@hidden)@\(.*\)/\1/')
+docker-run-%: IMAGE = $(shell echo '$@' | sed -e 
's/docker-run-\(address@hidden)@\(.*\)/\2/')
+docker-run-%:
+       @if test -z "$(IMAGE)" || test -z "$(CMD)"; \
+               then echo "Invalid target"; exit 1; \
+       fi
+       $(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \
+               $(call quiet-command,\
+                       $(SRC_PATH)/tests/docker/docker_run $(if $(KEEP),,--rm) 
\
+                               --privileged -t --net=none \
+                               -v $$(realpath $(SRC_PATH)):/var/tmp/qemu \
+                               -e QEMU_SRC=/var/tmp/qemu \
+                               -e V=$V -e J=$J \
+                               -v /var/tmp/qemu-docker-ccache:/var/tmp/ccache \
+                               -e CCACHE_DIR=/var/tmp/ccache \
+                               qemu:$(IMAGE) \
+                               /var/tmp/qemu/tests/docker/run \
+                               /var/tmp/qemu/tests/docker/$(CMD); \
+                       , "  RUN $(CMD) in $(IMAGE)")))
+
+docker-clean:
+       $(call quiet-command, $(SRC_PATH)/tests/docker/docker_clean)
-- 
2.4.3