From patchwork Mon Oct 3 16:32:12 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: 77225 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1765542qgf; Mon, 3 Oct 2016 09:39:17 -0700 (PDT) X-Received: by 10.55.163.68 with SMTP id m65mr20275703qke.88.1475512757741; Mon, 03 Oct 2016 09:39:17 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o1si21091708qkf.119.2016.10.03.09.39.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 03 Oct 2016 09:39:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; 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 2001:4830:134:3::11 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]:38159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1br6Gr-0003Cd-9f for patch@linaro.org; Mon, 03 Oct 2016 12:39:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1br6AE-0006Zx-Hd for qemu-devel@nongnu.org; Mon, 03 Oct 2016 12:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1br6AB-0002xi-Ge for qemu-devel@nongnu.org; Mon, 03 Oct 2016 12:32:25 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:36176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1br6AB-0002xV-5t for qemu-devel@nongnu.org; Mon, 03 Oct 2016 12:32:23 -0400 Received: by mail-wm0-x231.google.com with SMTP id k125so157495929wma.1 for ; Mon, 03 Oct 2016 09:32:23 -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=GNF80VtsV/+LXjTz6LhPInAIbe/3arvII0QgY7nYEss=; b=FKjxNd31K5M6G8gqh3EMWFZqMdej6bwGPEXPnmbIWLQsa0MIPjnIL/7PsQhCt6dMy8 eUk84NSVVO+nV2YGBWort+LCrxTmUTFIWsNAcJSP5UZ5iFiljxI2RJdSPmv07xqO3SPi 2eiz2CTcEttWMmfSoX2HR1b2L5saxl7daoSIU= 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=GNF80VtsV/+LXjTz6LhPInAIbe/3arvII0QgY7nYEss=; b=TSxSqu8Iz6LwG6nkrxSKcPCeF6JViJPdQzaan0+NVRoVKpViKMiYJ44XO2xmgHlNhT B0XkC3b+xzTldxRxVQXyJ+iUcCm0rnoKKboCyrZMDC9qnq1B1JHEKIqBSA+i/cQV04VB f8OV72xOnMPoSE/8CJbILCeh2c4cceH/sRkmjZpkTMJeLojHLA7u7EMroV6WKD7S78iQ oMVGdTVKmJO13lAjaTnut6qch6knFpZEriPLq+A0ju273dJjHmWEJyGpshnSymQKCvF1 NuuXBd+LcS0V43DBchlUM56lv53TrVqFs9dGMohoLnFdOPb/ssxNtSSTMoLgU/67jurE jXgw== X-Gm-Message-State: AA6/9RnT6RIBNhddNnfvekjQj4b4aIZP2X05nLAzxi4qnqkkPvvMeZrCmbuOC74UKWtGMMhg X-Received: by 10.28.87.212 with SMTP id l203mr10004596wmb.71.1475512342461; Mon, 03 Oct 2016 09:32:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i78sm19729214wmc.13.2016.10.03.09.32.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Oct 2016 09:32:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 782C23E0167; Mon, 3 Oct 2016 17:32:18 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: famz@redhat.com Date: Mon, 3 Oct 2016 17:32:12 +0100 Message-Id: <20161003163212.8101-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161003163212.8101-1-alex.bennee@linaro.org> References: <20161003163212.8101-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] X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PATCH v2 4/4] 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 - fix merge conflict --- tests/docker/Makefile.include | 89 ++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 23 deletions(-) -- 2.9.3 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 2fcc3c6..87735d8 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,73 @@ 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 SHOW_ENV=$(SHOW_ENV) \ + -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 SHOW_ENV=$(SHOW_ENV)\ - -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)