From patchwork Tue Sep 20 13:56:16 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: 76609 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1508350qgf; Tue, 20 Sep 2016 07:11:00 -0700 (PDT) X-Received: by 10.55.108.6 with SMTP id h6mr25245966qkc.289.1474380660486; Tue, 20 Sep 2016 07:11:00 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w3si18810179qkg.154.2016.09.20.07.11.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Sep 2016 07:11:00 -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]:35537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmLlD-0002wt-Ta for patch@linaro.org; Tue, 20 Sep 2016 10:10:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmLYF-0001Oz-RN for qemu-devel@nongnu.org; Tue, 20 Sep 2016 09:57:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmLY9-0002B9-TE for qemu-devel@nongnu.org; Tue, 20 Sep 2016 09:57:34 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:36605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmLY9-0002AU-6o for qemu-devel@nongnu.org; Tue, 20 Sep 2016 09:57:29 -0400 Received: by mail-wm0-f50.google.com with SMTP id w84so135642391wmg.1 for ; Tue, 20 Sep 2016 06:57:29 -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:mime-version :content-transfer-encoding; bh=NUzbqqGoW3Ml+uL6qv+pQdqfNH/uSqNGWcNzPESTgTI=; b=hj4/GupAUGcSundp3bNUjzeTZwg9QAoOlHodv+LhE0qfaClwHBwodZlpaojORe+JST lMb/1Rm9YdVKSQWzMWpdRNh+hFYHUE/ocQzLa3E4K5GFGeNL6xhxzbO+cht9qdGv25Ba 7JKRWHCleTR1ABRjoEmUcgGaUiALnb8UhbyNg= 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:mime-version :content-transfer-encoding; bh=NUzbqqGoW3Ml+uL6qv+pQdqfNH/uSqNGWcNzPESTgTI=; b=iJUAmZdOmj9Rp5SSNC+azOzGn85s2RtOzp6R7VUQaKdAjKUAytmVBJUbGsu2Gfghzc v+wkkDDuKMNzihsElIarpkUgErzWpSyZ+xjiN/qVnqtBu4WA9V9I7y1pzudRJEnsQ6vs uynqrGwqzUgXC4k6dOKTI0lEXjpHGXETMcdosnfOPrXloYEjzPlgyJ/y1PfhpVR+tM50 RA35HWpr9BjRpAMnWcNTLxwQLLXuq2Cj5TwXQpCcfvS3XVsRsk8lwvs/nwF8Iq0l+p1J E76QmEDcPf6lRwXZOK+VOeoZQWNZjFzyihPZHCMM1vEPrG+rIndxbMUSCQ4jjR7WLAl3 VgaQ== X-Gm-Message-State: AE9vXwNqkAnEUgAeYzrRHSa4mffmBYMKn+xkZRR+/rGDSdvLHIsi/JF9UIANcfNEEfeAgwJh X-Received: by 10.28.136.197 with SMTP id k188mr3693183wmd.54.1474379787021; Tue, 20 Sep 2016 06:56:27 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 188sm27605409wmo.1.2016.09.20.06.56.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 06:56:26 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A260E3E047F; Tue, 20 Sep 2016 14:56:25 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: famz@redhat.com Date: Tue, 20 Sep 2016 14:56:16 +0100 Message-Id: <20160920135616.2215-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.50 Subject: [Qemu-devel] [RFC] test/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. --- tests/docker/Makefile.include | 82 ++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 20 deletions(-) -- 2.9.3 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 19d4cc7..ee47085 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -101,31 +101,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 arbitary 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 $(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) \ + $(if $(EXECUTABLE), \ + $(call quiet-command, \ + $(SRC_PATH)/tests/docker/docker.py update \ + $(IMAGE) $(EXECUTABLE))) + $(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 \ + -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)"))) + $(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 $(findstring $(IMAGE), $(DOCKER_IMAGES)) \ + , @echo "Verified $(IMAGE)" \ + , @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 $(findstring $(CMD), $(DOCKER_TESTS)) \ + , @echo "Verified $(CMD)" \ + , @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)