From patchwork Tue Feb 16 12:39:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8324711 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 288109F6E7 for ; Tue, 16 Feb 2016 12:40:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6624020266 for ; Tue, 16 Feb 2016 12:40:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 357922026D for ; Tue, 16 Feb 2016 12:40:42 +0000 (UTC) Received: from localhost ([::1]:45240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVevp-0000qN-Jd for patchwork-qemu-devel@patchwork.kernel.org; Tue, 16 Feb 2016 07:40:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVevV-0000ld-0G for qemu-devel@nongnu.org; Tue, 16 Feb 2016 07:40:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVevT-00030u-Pu for qemu-devel@nongnu.org; Tue, 16 Feb 2016 07:40:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVevT-00030p-Fh for qemu-devel@nongnu.org; Tue, 16 Feb 2016 07:40:19 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 1B536C0A805A; Tue, 16 Feb 2016 12:40:19 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-7-134.pek2.redhat.com [10.72.7.134]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1GCdxbD024209; Tue, 16 Feb 2016 07:40:15 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 16 Feb 2016 20:39:46 +0800 Message-Id: <1455626399-7111-3-git-send-email-famz@redhat.com> In-Reply-To: <1455626399-7111-1-git-send-email-famz@redhat.com> References: <1455626399-7111-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, peter.maydell@linaro.org, jsnow@redhat.com, stefanha@redhat.com, sw@weilnetz.de, Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v2 02/15] Makefile: Rules for docker testing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 (docker-run-FOO@BAR) 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 --- 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 docker-@$i) \ + $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ + $(eval .PHONY: docker-$t@$i) \ + $(eval docker-$t@$i: docker-image-$i) \ + $(eval docker-$t@$i: docker-run-$t@$i) \ + $(eval docker-@$i: docker-$t@$i) \ + $(eval docker-test: docker-run-$t@$i) \ + ) \ +) + +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 ' docker-TEST@IMAGE: 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 ' docker-@IMAGE: 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-\([^@]*\)@\(.*\)/\1/') +docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\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)