From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvxNs-0005Gk-SY for qemu-devel@nongnu.org; Sun, 16 Oct 2016 22:10:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bvxNr-0005rf-NE for qemu-devel@nongnu.org; Sun, 16 Oct 2016 22:10:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bvxNr-0005rY-DQ for qemu-devel@nongnu.org; Sun, 16 Oct 2016 22:10:35 -0400 From: Fam Zheng Date: Mon, 17 Oct 2016 10:10:22 +0800 Message-Id: <1476670222-31642-5-git-send-email-famz@redhat.com> In-Reply-To: <1476670222-31642-1-git-send-email-famz@redhat.com> References: <1476670222-31642-1-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 4/4] tests/docker/Makefile.include: add a generic docker-run target List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Fam Zheng From: Alex Benn=C3=A9e This re-factors the docker makefile to include a docker-run target which can be controlled entirely from environment variables specified on the make command line. This allows us to run against any given docker image we may have in our repository, for example: make docker-run TEST=3D"test-quick" IMAGE=3D"debian:arm64" \ EXECUTABLE=3D./aarch64-linux-user/qemu-aarch64 The existing docker-foo@bar targets still work but the inline verification has been dropped because we already don't hit that due to other pattern rules in rules.mak. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20161011161625.9070-5-alex.bennee@linaro.org> Message-Id: <20161011161625.9070-6-alex.bennee@linaro.org> [Squash in the verification removal patch. - Fam] Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 61 +++++++++++++++++++++++++++----------= ------ 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.includ= e index b44daab..3f15d5a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -78,6 +78,7 @@ docker: @echo ' "IMAGE" is one of the listed container = name."' @echo ' docker-image: Build all images.' @echo ' docker-image-IMAGE: Build image "IMAGE".' + @echo ' docker-run: For manually running a "TEST" with "IMA= GE"' @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' @@ -101,31 +102,45 @@ docker: @echo ' NOCACHE=3D1 Ignore cache when build images.' @echo ' EXECUTABLE=3D Include executable in image.' =20 +# This rule if for directly running against an arbitrary docker target. +# It is called by the expanded docker targets (e.g. make +# docker-test-foo@bar) which will do additional verification. +# +# For example: make docker-run TEST=3D"test-quick" IMAGE=3D"debian:arm64= " EXECUTABLE=3D./aarch64-linux-user/qemu-aarch64 +# +docker-run: docker-qemu-src + @mkdir -p "$(DOCKER_CCACHE_DIR)" + @if test -z "$(IMAGE)" || test -z "$(TEST)"; \ + then echo "Invalid target $(IMAGE)/$(TEST)"; exit 1; \ + fi + $(if $(EXECUTABLE), \ + $(call quiet-command, \ + $(SRC_PATH)/tests/docker/docker.py update \ + $(IMAGE) $(EXECUTABLE), \ + " COPYING $(EXECUTABLE) to $(IMAGE)")) + $(call quiet-command, \ + $(SRC_PATH)/tests/docker/docker.py run \ + -t \ + $(if $V,,--rm) \ + $(if $(DEBUG),-i,--net=3Dnone) \ + -e TARGET_LIST=3D$(TARGET_LIST) \ + -e EXTRA_CONFIGURE_OPTS=3D"$(EXTRA_CONFIGURE_OPTS)" \ + -e V=3D$V -e J=3D$J -e DEBUG=3D$(DEBUG) \ + -e SHOW_ENV=3D$(SHOW_ENV) \ + -e CCACHE_DIR=3D/var/tmp/ccache \ + -v $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \ + -v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \ + $(IMAGE) \ + /var/tmp/qemu/run \ + $(TEST), " RUN $(TEST) in ${IMAGE}") + +# Run targets: +# +# Of the form docker-TEST-FOO@IMAGE-BAR which will then be expanded into= a call to "make docker-run" docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\1/') docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*= \)@\(.*\)/\2/') -docker-run-%: docker-qemu-src - @mkdir -p "$(DOCKER_CCACHE_DIR)" - @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,\ - if $(SRC_PATH)/tests/docker/docker.py images | \ - awk '$$1=3D=3D"qemu" && $$2=3D=3D"$(IMAGE)"{found=3D1} END{exit(!fou= nd)}'; then \ - $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \ - -t \ - $(if $(DEBUG),-i,--net=3Dnone) \ - -e TARGET_LIST=3D$(TARGET_LIST) \ - -e EXTRA_CONFIGURE_OPTS=3D$(EXTRA_CONFIGURE_OPTS) \ - -e V=3D$V -e J=3D$J -e DEBUG=3D$(DEBUG) -e SHOW_ENV=3D$(SHOW_ENV)\ - -e CCACHE_DIR=3D/var/tmp/ccache \ - -v $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \ - -v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \ - qemu:$(IMAGE) \ - /var/tmp/qemu/run \ - $(CMD); \ - fi \ - ,"RUN","$(CMD) in $(IMAGE)"))) +docker-run-%: + @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu:$(IMAGE) =20 docker-clean: $(call quiet-command, $(SRC_PATH)/tests/docker/docker.py clean) --=20 2.7.4