From patchwork Thu Sep 22 13:57:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 76794 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp63891qgf; Thu, 22 Sep 2016 07:28:32 -0700 (PDT) X-Received: by 10.200.42.130 with SMTP id b2mr2297343qta.106.1474554512913; Thu, 22 Sep 2016 07:28:32 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id k17si1304786qtk.13.2016.09.22.07.28.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 22 Sep 2016 07:28:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn4zI-0007Y4-Ae for patch@linaro.org; Thu, 22 Sep 2016 10:28:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn4WL-0003He-7s for qemu-devel@nongnu.org; Thu, 22 Sep 2016 09:58:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bn4WI-0004wV-2E for qemu-devel@nongnu.org; Thu, 22 Sep 2016 09:58:37 -0400 Received: from mail-lf0-f49.google.com ([209.85.215.49]:35374) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn4WH-0004wJ-Mq for qemu-devel@nongnu.org; Thu, 22 Sep 2016 09:58:34 -0400 Received: by mail-lf0-f49.google.com with SMTP id l131so68673241lfl.2 for ; Thu, 22 Sep 2016 06:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j+0WKH+HtDr183p7AAqHQZNYfrw/4ptHSJHsN8mtEyw=; b=CUeRO0KKPpxX7DYnm0YXyVUMflCNUWaJdvsOQorbGLLKyV8xrW5PD1UT6Wp9zP7B4T KU4B1k4UCwihVn6U4OLI+J3rT0cn8Vjar4jDvXiZTWOUzGmZNNlbbzLoIyczEnBMhIML ajcba+/uodcKYvMcZbjLUZbrtr9KSePUQj5KA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j+0WKH+HtDr183p7AAqHQZNYfrw/4ptHSJHsN8mtEyw=; b=MkF9DipcSZ3AsGjq9jzXZEpgCkVdH92luI33unqbzK+Drp1TCUNFfpjlsvtZwoYd8k CGvE+3ySaAX138lPyKXh/11Ekik3uCIe/1XsSqCgQe/kbnLJ6YXj4ocv8gIl4T+AOb0i Sbmh6H4oFX7E6PN3eeb8Biv3f0w+JUOr0LIMR3lHx67bbAKXhdKF78GSLa80ge+K/oQ8 kRcipIdNqjab81Z6uoTmkoiKRcDGN69YHi39d0cu6cVUtUBJfkmPl7IzdZ+LUCFNBzKZ UBUVY80RnJKfZr7OsdSrG07adXMnneBbxQDpbNFAyMdt2vT9/w2xLWqWhqqP/3fu8XFT +ZsQ== X-Gm-Message-State: AE9vXwNDxRKPD3IIcjh/bw4wAH5yDirgL2NwnoJBcZL+dIWuAvH5oc6MUNHvlb/NpVr5kVwy X-Received: by 10.194.176.229 with SMTP id cl5mr2151714wjc.107.1474552652441; Thu, 22 Sep 2016 06:57:32 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id lj2sm2227022wjc.38.2016.09.22.06.57.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 06:57:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E448B3E02A4; Thu, 22 Sep 2016 14:57:29 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: famz@redhat.com Date: Thu, 22 Sep 2016 14:57:24 +0100 Message-Id: <20160922135724.22304-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160922135724.22304-1-alex.bennee@linaro.org> References: <20160922135724.22304-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.215.49 Subject: [Qemu-devel] [PATCH 3/3] tests/docker/Makefile.include: add a generic docker-run target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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="test-quick" IMAGE="debian:arm64" \ EXECUTABLE=./aarch64-linux-user/qemu-aarch64 The existing docker-foo@bar targets still work but the inline verification has been shunted into other target prerequisites before a sub-make is invoked for the docker-run target. Signed-off-by: Alex Bennée --- NB: I dropped the awk magic that verifies the image exists before running. I couldn't get the thing to work in my shell so wasn't quite sure what it was doing. v2 - fix spelling on arbitrary - document docker-run in help - add note on docker.py update - reduce noise on verifying other images - revert back to using filter --- tests/docker/Makefile.include | 88 ++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 23 deletions(-) -- 2.9.3 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 19d4cc7..5f71293 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 "IMAGE"' @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' @@ -101,31 +102,72 @@ docker: @echo ' NOCACHE=1 Ignore cache when build images.' @echo ' EXECUTABLE= Include executable in 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-%: docker-qemu-src +# 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="test-quick" IMAGE="debian:arm64" EXECUTABLE=./aarch64-linux-user/qemu-aarch64 +# +docker-run: docker-qemu-src @mkdir -p "$(DOCKER_CCACHE_DIR)" - @if test -z "$(IMAGE)" || test -z "$(CMD)"; \ - then echo "Invalid target"; exit 1; \ + @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=none) \ + -e TARGET_LIST=$(TARGET_LIST) \ + -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ + -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ + -e CCACHE_DIR=/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}") + +# +# Verification targets +# +# These targets help verify the test (CMD) and docker tag (IMAGE) are +# part of the built in set of tests and images. You can still call the +# docker-run target directly for testsing against arbitary images. +# + +docker-verify-image-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-verify-image-\([^@]*\)@\(.*\)/\2/') +docker-verify-image-%: + @if test -z "$(IMAGE)"; \ + then echo "Invalid image"; exit 1; \ fi - $(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \ - $(call quiet-command,\ - if $(SRC_PATH)/tests/docker/docker.py images | \ - awk '$$1=="qemu" && $$2=="$(IMAGE)"{found=1} END{exit(!found)}'; then \ - $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \ - -t \ - $(if $(DEBUG),-i,--net=none) \ - -e TARGET_LIST=$(TARGET_LIST) \ - -e EXTRA_CONFIGURE_OPTS=$(EXTRA_CONFIGURE_OPTS) \ - -e V=$V -e J=$J -e DEBUG=$(DEBUG)\ - -e CCACHE_DIR=/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)"))) + $(if $(filter $(IMAGE), $(DOCKER_IMAGES)), , \ + echo "$(IMAGE) is not a known image"; exit 1) \ + +docker-verify-test-%: CMD = $(shell echo '$@' | sed -e 's/docker-verify-test-\([^@]*\)@\(.*\)/\1/') +docker-verify-test-%: + @if test -z "$(CMD)"; \ + then echo "Invalid test"; exit 1; \ + fi + $(if $(filter $(CMD), $(DOCKER_TESTS)), , \ + echo "$(CMD) is not a known test"; exit 1) + +# Run targets +# +# This will take a target such as docker-test-foo@bar and verify that: +# - the test test-foo is a known test +# - the image bar is a known image +# +# It will then call the docker-run +docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/') +docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/') +docker-run-%: docker-verify-image-% docker-verify-test-% + @make docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) docker-clean: $(call quiet-command, $(SRC_PATH)/tests/docker/docker.py clean)